diff options
| author | Peter Eisentraut | 2023-11-16 14:57:21 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2023-11-16 15:16:07 +0000 |
| commit | 3af0d17acef7538c5605afa5dd7929cfd7e38d9e (patch) | |
| tree | 0baa4f7d0f5b8bdcd1921c9273e13fe580f2f67d | |
| parent | 743ddafc7124604c1f59b5d9f661be47a987a8d0 (diff) | |
pgcrypto: Split off pgp-encrypt-md5 test
In FIPS mode, these tests will fail. By having them in a separate
file, it would make it easier to have an alternative output file or
selectively disable these tests. This isn't done here; this is just
some preparation.
Reviewed-by: Tom Lane <[email protected]>
Discussion: https://www.postgresql.org/message-id/[email protected]
| -rw-r--r-- | contrib/pgcrypto/Makefile | 2 | ||||
| -rw-r--r-- | contrib/pgcrypto/expected/pgp-encrypt-md5.out | 11 | ||||
| -rw-r--r-- | contrib/pgcrypto/expected/pgp-encrypt.out | 8 | ||||
| -rw-r--r-- | contrib/pgcrypto/meson.build | 1 | ||||
| -rw-r--r-- | contrib/pgcrypto/sql/pgp-encrypt-md5.sql | 7 | ||||
| -rw-r--r-- | contrib/pgcrypto/sql/pgp-encrypt.sql | 3 |
6 files changed, 20 insertions, 12 deletions
diff --git a/contrib/pgcrypto/Makefile b/contrib/pgcrypto/Makefile index 7fb59f51b72..5efa10c334c 100644 --- a/contrib/pgcrypto/Makefile +++ b/contrib/pgcrypto/Makefile @@ -42,7 +42,7 @@ PGFILEDESC = "pgcrypto - cryptographic functions" REGRESS = init md5 sha1 hmac-md5 hmac-sha1 blowfish rijndael \ sha2 des 3des cast5 \ crypt-des crypt-md5 crypt-blowfish crypt-xdes \ - pgp-armor pgp-decrypt pgp-encrypt $(CF_PGP_TESTS) \ + pgp-armor pgp-decrypt pgp-encrypt pgp-encrypt-md5 $(CF_PGP_TESTS) \ pgp-pubkey-decrypt pgp-pubkey-encrypt pgp-info EXTRA_CLEAN = gen-rtab diff --git a/contrib/pgcrypto/expected/pgp-encrypt-md5.out b/contrib/pgcrypto/expected/pgp-encrypt-md5.out new file mode 100644 index 00000000000..339e12a434b --- /dev/null +++ b/contrib/pgcrypto/expected/pgp-encrypt-md5.out @@ -0,0 +1,11 @@ +-- +-- PGP encrypt using MD5 +-- +select pgp_sym_decrypt( + pgp_sym_encrypt('Secret.', 'key', 's2k-digest-algo=md5'), + 'key', 'expect-s2k-digest-algo=md5'); + pgp_sym_decrypt +----------------- + Secret. +(1 row) + diff --git a/contrib/pgcrypto/expected/pgp-encrypt.out b/contrib/pgcrypto/expected/pgp-encrypt.out index 77e45abe53a..50cd3f6daa0 100644 --- a/contrib/pgcrypto/expected/pgp-encrypt.out +++ b/contrib/pgcrypto/expected/pgp-encrypt.out @@ -122,14 +122,6 @@ NOTICE: pgp_decrypt: unexpected s2k_count: expected 65000000 got 65011712 -- s2k digest change select pgp_sym_decrypt( - pgp_sym_encrypt('Secret.', 'key', 's2k-digest-algo=md5'), - 'key', 'expect-s2k-digest-algo=md5'); - pgp_sym_decrypt ------------------ - Secret. -(1 row) - -select pgp_sym_decrypt( pgp_sym_encrypt('Secret.', 'key', 's2k-digest-algo=sha1'), 'key', 'expect-s2k-digest-algo=sha1'); pgp_sym_decrypt diff --git a/contrib/pgcrypto/meson.build b/contrib/pgcrypto/meson.build index df7dd50dbc3..4f62ea0af03 100644 --- a/contrib/pgcrypto/meson.build +++ b/contrib/pgcrypto/meson.build @@ -48,6 +48,7 @@ pgcrypto_regress = [ 'pgp-armor', 'pgp-decrypt', 'pgp-encrypt', + 'pgp-encrypt-md5', 'pgp-pubkey-decrypt', 'pgp-pubkey-encrypt', 'pgp-info', diff --git a/contrib/pgcrypto/sql/pgp-encrypt-md5.sql b/contrib/pgcrypto/sql/pgp-encrypt-md5.sql new file mode 100644 index 00000000000..201636c8209 --- /dev/null +++ b/contrib/pgcrypto/sql/pgp-encrypt-md5.sql @@ -0,0 +1,7 @@ +-- +-- PGP encrypt using MD5 +-- + +select pgp_sym_decrypt( + pgp_sym_encrypt('Secret.', 'key', 's2k-digest-algo=md5'), + 'key', 'expect-s2k-digest-algo=md5'); diff --git a/contrib/pgcrypto/sql/pgp-encrypt.sql b/contrib/pgcrypto/sql/pgp-encrypt.sql index ed8b17776b3..f67329c2c30 100644 --- a/contrib/pgcrypto/sql/pgp-encrypt.sql +++ b/contrib/pgcrypto/sql/pgp-encrypt.sql @@ -64,9 +64,6 @@ select pgp_sym_decrypt( -- s2k digest change select pgp_sym_decrypt( - pgp_sym_encrypt('Secret.', 'key', 's2k-digest-algo=md5'), - 'key', 'expect-s2k-digest-algo=md5'); -select pgp_sym_decrypt( pgp_sym_encrypt('Secret.', 'key', 's2k-digest-algo=sha1'), 'key', 'expect-s2k-digest-algo=sha1'); |