summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Haas <rhaas@postgresql.org>2018-01-31 16:28:11 -0500
committerRobert Haas <rhaas@postgresql.org>2018-01-31 16:33:46 -0500
commit4ab8ded9fb4e3b28051e994163b90f0ea4946f9b (patch)
tree831288a7439c4f09e869391b49fdd22badaaaa33
parent98e4dce78b5139a1a7935903627498c41f0b2d6a (diff)
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.out2
-rw-r--r--contrib/pgcrypto/sql/rijndael.sql2
-rw-r--r--doc/src/sgml/pgcrypto.sgml2
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 254fc0776bd..59f05e177ca 100644
--- a/doc/src/sgml/pgcrypto.sgml
+++ b/doc/src/sgml/pgcrypto.sgml
@@ -1014,7 +1014,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</> is one of:
<itemizedlist>