Fix some more regression tests (missed these because they're only

run when built with --with-openssl).

diff --git a/contrib/pgcrypto/expected/3des.out b/contrib/pgcrypto/expected/3des.out
index 3e6a88e8bf4ada30e1426a084fd6faad2cc096f2..8983a73b8a90d796d5fff1e325a4a3682b7434c9 100644 (file)
--- a/contrib/pgcrypto/expected/3des.out
+++ b/contrib/pgcrypto/expected/3des.out
@@ -1,6 +1,8 @@
 --
 -- 3DES cipher
 --
+-- ensure consistent test output regardless of the default bytea format
+SET bytea_output TO escape;
 -- test vector from somewhere
 SELECT encode(encrypt(
 decode('80 00 00 00 00 00 00 00', 'hex'),

diff --git a/contrib/pgcrypto/expected/cast5.out b/contrib/pgcrypto/expected/cast5.out
index 4ca824e2f879db498ecc02618782452560a95775..c1ecd9197f67a58580039762b13c923022c531a5 100644 (file)
--- a/contrib/pgcrypto/expected/cast5.out
+++ b/contrib/pgcrypto/expected/cast5.out
@@ -1,6 +1,8 @@
 --
 -- Cast5 cipher
 --
+-- ensure consistent test output regardless of the default bytea format
+SET bytea_output TO escape;
 -- test vectors from RFC2144
 -- 128 bit key
 SELECT encode(encrypt(

diff --git a/contrib/pgcrypto/expected/des.out b/contrib/pgcrypto/expected/des.out
index 00513c4e6aca3c4458448e2f8c6fba87d9a9a654..d0fd0041cacdbcf22b291d4d82ce24bfe7431fd8 100644 (file)
--- a/contrib/pgcrypto/expected/des.out
+++ b/contrib/pgcrypto/expected/des.out
@@ -1,6 +1,8 @@
 --
 -- DES cipher
 --
+-- ensure consistent test output regardless of the default bytea format
+SET bytea_output TO escape;
 -- no official test vectors atm
 -- from blowfish.sql
 SELECT encode(encrypt(

diff --git a/contrib/pgcrypto/sql/3des.sql b/contrib/pgcrypto/sql/3des.sql
index 99b936fa14597280f6030bea9591d099f404a22b..274d7d81f68dad1e8a550b27ac1f443d4a81d18a 100644 (file)
--- a/contrib/pgcrypto/sql/3des.sql
+++ b/contrib/pgcrypto/sql/3des.sql
@@ -1,6 +1,8 @@
 --
 -- 3DES cipher
 --
+-- ensure consistent test output regardless of the default bytea format
+SET bytea_output TO escape;
 
 -- test vector from somewhere
 SELECT encode(encrypt(

diff --git a/contrib/pgcrypto/sql/cast5.sql b/contrib/pgcrypto/sql/cast5.sql
index 0761f34e758b41ccc2e19a79dd98b942bc456939..599ee060fadcf0b03f0429b25854681cf0c5c81b 100644 (file)
--- a/contrib/pgcrypto/sql/cast5.sql
+++ b/contrib/pgcrypto/sql/cast5.sql
@@ -1,6 +1,8 @@
 --
 -- Cast5 cipher
 --
+-- ensure consistent test output regardless of the default bytea format
+SET bytea_output TO escape;
 
 -- test vectors from RFC2144
 

diff --git a/contrib/pgcrypto/sql/des.sql b/contrib/pgcrypto/sql/des.sql
index 179bd83ba91f2b7ca4060544c22a71eaeb900332..0b3d3392511d11ae086b664d260a87a2f7b71b9a 100644 (file)
--- a/contrib/pgcrypto/sql/des.sql
+++ b/contrib/pgcrypto/sql/des.sql
@@ -1,6 +1,8 @@
 --
 -- DES cipher
 --
+-- ensure consistent test output regardless of the default bytea format
+SET bytea_output TO escape;
 
 -- no official test vectors atm