Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit3af0d17

Browse files
committed
pgcrypto: Split off pgp-encrypt-md5 test
In FIPS mode, these tests will fail. By having them in a separatefile, it would make it easier to have an alternative output file orselectively disable these tests. This isn't done here; this is justsome preparation.Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>Discussion:https://www.postgresql.org/message-id/2766054.1700080156@sss.pgh.pa.us
1 parent743ddaf commit3af0d17

File tree

6 files changed

+20
-12
lines changed

6 files changed

+20
-12
lines changed

‎contrib/pgcrypto/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ PGFILEDESC = "pgcrypto - cryptographic functions"
4242
REGRESS = init md5 sha1 hmac-md5 hmac-sha1 blowfish rijndael\
4343
sha2 des 3des cast5\
4444
crypt-des crypt-md5 crypt-blowfish crypt-xdes\
45-
pgp-armor pgp-decrypt pgp-encrypt$(CF_PGP_TESTS)\
45+
pgp-armor pgp-decrypt pgp-encryptpgp-encrypt-md5$(CF_PGP_TESTS)\
4646
pgp-pubkey-decrypt pgp-pubkey-encrypt pgp-info
4747

4848
EXTRA_CLEAN = gen-rtab
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--
2+
-- PGP encrypt using MD5
3+
--
4+
select pgp_sym_decrypt(
5+
pgp_sym_encrypt('Secret.', 'key', 's2k-digest-algo=md5'),
6+
'key', 'expect-s2k-digest-algo=md5');
7+
pgp_sym_decrypt
8+
-----------------
9+
Secret.
10+
(1 row)
11+

‎contrib/pgcrypto/expected/pgp-encrypt.out

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,6 @@ NOTICE: pgp_decrypt: unexpected s2k_count: expected 65000000 got 65011712
121121
(1 row)
122122

123123
-- s2k digest change
124-
select pgp_sym_decrypt(
125-
pgp_sym_encrypt('Secret.', 'key', 's2k-digest-algo=md5'),
126-
'key', 'expect-s2k-digest-algo=md5');
127-
pgp_sym_decrypt
128-
-----------------
129-
Secret.
130-
(1 row)
131-
132124
select pgp_sym_decrypt(
133125
pgp_sym_encrypt('Secret.', 'key', 's2k-digest-algo=sha1'),
134126
'key', 'expect-s2k-digest-algo=sha1');

‎contrib/pgcrypto/meson.build

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ pgcrypto_regress = [
4848
'pgp-armor',
4949
'pgp-decrypt',
5050
'pgp-encrypt',
51+
'pgp-encrypt-md5',
5152
'pgp-pubkey-decrypt',
5253
'pgp-pubkey-encrypt',
5354
'pgp-info',
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
--
2+
-- PGP encrypt using MD5
3+
--
4+
5+
select pgp_sym_decrypt(
6+
pgp_sym_encrypt('Secret.','key','s2k-digest-algo=md5'),
7+
'key','expect-s2k-digest-algo=md5');

‎contrib/pgcrypto/sql/pgp-encrypt.sql

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,6 @@ select pgp_sym_decrypt(
6363
'key','expect-s2k-count=65000000');
6464

6565
-- s2k digest change
66-
select pgp_sym_decrypt(
67-
pgp_sym_encrypt('Secret.','key','s2k-digest-algo=md5'),
68-
'key','expect-s2k-digest-algo=md5');
6966
select pgp_sym_decrypt(
7067
pgp_sym_encrypt('Secret.','key','s2k-digest-algo=sha1'),
7168
'key','expect-s2k-digest-algo=sha1');

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp