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

diff --git a/contrib/pgcrypto/expected/rijndael.out b/contrib/pgcrypto/expected/rijndael.out
index 14b2650c324f884cb36889bb3e66b673c67505fb..5366604a3d3b1211a2553ad00a91de5be4624916 100644 (file)
--- 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 bfbf95d39b843c5464fcc65b3b6ecfb3e0fdf451..a9bcbf33d0a7a41335dacb5d37e319c97005302b 100644 (file)
--- 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 25341d684c99e6a3870ce225174883b715348869..efa193d22e358e1bf469986914aaffd1a6f0d7a2 100644 (file)
--- 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> &mdash; Blowfish</para></listitem>
-   <listitem><para><literal>aes</literal> &mdash; AES (Rijndael-128)</para></listitem>
+   <listitem><para><literal>aes</literal> &mdash; AES (Rijndael-128, -192 or -256)</para></listitem>
   </itemizedlist>
    and <replaceable>mode</replaceable> is one of:
   <itemizedlist>