diff options
| author | Robert Haas <rhaas@postgresql.org> | 2018-01-31 16:28:11 -0500 |
|---|---|---|
| committer | Robert Haas <rhaas@postgresql.org> | 2018-01-31 16:33:11 -0500 |
| commit | d40d97d6c74496a35111b29f8eef2a09cb43bc58 (patch) | |
| tree | bb1f276eb555d9b90d19f3909326ae14011aae9e | |
| parent | e5dede90971d2ddbb7bca72ffc329c043bf717db (diff) | |
| download | postgresql-d40d97d6c74496a35111b29f8eef2a09cb43bc58.tar.gz postgresql-d40d97d6c74496a35111b29f8eef2a09cb43bc58.zip | |
pgcrypto's encrypt() supports AES-128, AES-192, and AES-256
Previously, only 128 was mentioned, but the others are also supported.
Thomas Munro, reviewed by Michael Paquier and extended a bit by me.
Discussion: http://postgr.es/m/CAEepm=1XbBHXYJKofGjnM2Qfz-ZBVqhGU4AqvtgR+Hegy4fdKg@mail.gmail.com
| -rw-r--r-- | contrib/pgcrypto/expected/rijndael.out | 2 | ||||
| -rw-r--r-- | contrib/pgcrypto/sql/rijndael.sql | 2 | ||||
| -rw-r--r-- | doc/src/sgml/pgcrypto.sgml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/contrib/pgcrypto/expected/rijndael.out b/contrib/pgcrypto/expected/rijndael.out index 14b2650c324..5366604a3d3 100644 --- a/contrib/pgcrypto/expected/rijndael.out +++ b/contrib/pgcrypto/expected/rijndael.out @@ -1,5 +1,5 @@ -- --- AES / Rijndael-128 cipher +-- AES cipher (aka Rijndael-128, -192, or -256) -- -- ensure consistent test output regardless of the default bytea format SET bytea_output TO escape; diff --git a/contrib/pgcrypto/sql/rijndael.sql b/contrib/pgcrypto/sql/rijndael.sql index bfbf95d39b8..a9bcbf33d0a 100644 --- a/contrib/pgcrypto/sql/rijndael.sql +++ b/contrib/pgcrypto/sql/rijndael.sql @@ -1,5 +1,5 @@ -- --- AES / Rijndael-128 cipher +-- AES cipher (aka Rijndael-128, -192, or -256) -- -- ensure consistent test output regardless of the default bytea format SET bytea_output TO escape; diff --git a/doc/src/sgml/pgcrypto.sgml b/doc/src/sgml/pgcrypto.sgml index 25341d684c9..efa193d22e3 100644 --- a/doc/src/sgml/pgcrypto.sgml +++ b/doc/src/sgml/pgcrypto.sgml @@ -1062,7 +1062,7 @@ decrypt_iv(data bytea, key bytea, iv bytea, type text) returns bytea <itemizedlist> <listitem><para><literal>bf</literal> — Blowfish</para></listitem> - <listitem><para><literal>aes</literal> — AES (Rijndael-128)</para></listitem> + <listitem><para><literal>aes</literal> — AES (Rijndael-128, -192 or -256)</para></listitem> </itemizedlist> and <replaceable>mode</replaceable> is one of: <itemizedlist> |