From 71bf5bc2c406966ae4bdcfc213f102da4756e8d9 Mon Sep 17 00:00:00 2001
From: Robert Haas <rhaas@postgresql.org>
Date: Wed, 31 Jan 2018 16:28:11 -0500
Subject: [PATCH] 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
---
 contrib/pgcrypto/expected/rijndael.out | 2 +-
 contrib/pgcrypto/sql/rijndael.sql      | 2 +-
 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 bfcbe02f851..a844afce99b 100644
--- a/doc/src/sgml/pgcrypto.sgml
+++ b/doc/src/sgml/pgcrypto.sgml
@@ -1049,7 +1049,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>
-- 
GitLab