Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 9786b89

Browse files
peterepetere
committed
Put tests of md5() function into separate test file
In FIPS mode, these calls 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: Michael Paquier <michael@paquier.xyz> Discussion: https://www.postgresql.org/message-id/647f6cc1-473d-f788-ade0-c09201e5ab6a@enterprisedb.com
1 parent 97da482 commit 9786b89

File tree

5 files changed

+128
-121
lines changed

5 files changed

+128
-121
lines changed

‎src/test/regress/expected/md5.out

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
--
2+
-- MD5 test suite - from IETF RFC 1321
3+
-- (see: https://www.rfc-editor.org/rfc/rfc1321)
4+
--
5+
-- (The md5() function will error in OpenSSL FIPS mode. By keeping
6+
-- this test in a separate file, it is easier to manage variant
7+
-- results.)
8+
select md5('') = 'd41d8cd98f00b204e9800998ecf8427e' AS "TRUE";
9+
TRUE
10+
------
11+
t
12+
(1 row)
13+
14+
select md5('a') = '0cc175b9c0f1b6a831c399e269772661' AS "TRUE";
15+
TRUE
16+
------
17+
t
18+
(1 row)
19+
20+
select md5('abc') = '900150983cd24fb0d6963f7d28e17f72' AS "TRUE";
21+
TRUE
22+
------
23+
t
24+
(1 row)
25+
26+
select md5('message digest') = 'f96b697d7cb7938d525a2f31aaf161d0' AS "TRUE";
27+
TRUE
28+
------
29+
t
30+
(1 row)
31+
32+
select md5('abcdefghijklmnopqrstuvwxyz') = 'c3fcd3d76192e4007dfb496cca67e13b' AS "TRUE";
33+
TRUE
34+
------
35+
t
36+
(1 row)
37+
38+
select md5('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789') = 'd174ab98d277d9f5a5611c2c9f419d9f' AS "TRUE";
39+
TRUE
40+
------
41+
t
42+
(1 row)
43+
44+
select md5('12345678901234567890123456789012345678901234567890123456789012345678901234567890') = '57edf4a22be3c955ac49da2e2107b67a' AS "TRUE";
45+
TRUE
46+
------
47+
t
48+
(1 row)
49+
50+
select md5(''::bytea) = 'd41d8cd98f00b204e9800998ecf8427e' AS "TRUE";
51+
TRUE
52+
------
53+
t
54+
(1 row)
55+
56+
select md5('a'::bytea) = '0cc175b9c0f1b6a831c399e269772661' AS "TRUE";
57+
TRUE
58+
------
59+
t
60+
(1 row)
61+
62+
select md5('abc'::bytea) = '900150983cd24fb0d6963f7d28e17f72' AS "TRUE";
63+
TRUE
64+
------
65+
t
66+
(1 row)
67+
68+
select md5('message digest'::bytea) = 'f96b697d7cb7938d525a2f31aaf161d0' AS "TRUE";
69+
TRUE
70+
------
71+
t
72+
(1 row)
73+
74+
select md5('abcdefghijklmnopqrstuvwxyz'::bytea) = 'c3fcd3d76192e4007dfb496cca67e13b' AS "TRUE";
75+
TRUE
76+
------
77+
t
78+
(1 row)
79+
80+
select md5('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'::bytea) = 'd174ab98d277d9f5a5611c2c9f419d9f' AS "TRUE";
81+
TRUE
82+
------
83+
t
84+
(1 row)
85+
86+
select md5('12345678901234567890123456789012345678901234567890123456789012345678901234567890'::bytea) = '57edf4a22be3c955ac49da2e2107b67a' AS "TRUE";
87+
TRUE
88+
------
89+
t
90+
(1 row)
91+

‎src/test/regress/expected/strings.out

Lines changed: 0 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -2118,94 +2118,6 @@ select to_hex(256::bigint*256::bigint*256::bigint*256::bigint - 1) AS "ffffffff"
21182118
ffffffff
21192119
(1 row)
21202120

2121-
--
2122-
-- MD5 test suite - from IETF RFC 1321
2123-
-- (see: ftp://ftp.rfc-editor.org/in-notes/rfc1321.txt)
2124-
--
2125-
select md5('') = 'd41d8cd98f00b204e9800998ecf8427e' AS "TRUE";
2126-
TRUE
2127-
------
2128-
t
2129-
(1 row)
2130-
2131-
select md5('a') = '0cc175b9c0f1b6a831c399e269772661' AS "TRUE";
2132-
TRUE
2133-
------
2134-
t
2135-
(1 row)
2136-
2137-
select md5('abc') = '900150983cd24fb0d6963f7d28e17f72' AS "TRUE";
2138-
TRUE
2139-
------
2140-
t
2141-
(1 row)
2142-
2143-
select md5('message digest') = 'f96b697d7cb7938d525a2f31aaf161d0' AS "TRUE";
2144-
TRUE
2145-
------
2146-
t
2147-
(1 row)
2148-
2149-
select md5('abcdefghijklmnopqrstuvwxyz') = 'c3fcd3d76192e4007dfb496cca67e13b' AS "TRUE";
2150-
TRUE
2151-
------
2152-
t
2153-
(1 row)
2154-
2155-
select md5('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789') = 'd174ab98d277d9f5a5611c2c9f419d9f' AS "TRUE";
2156-
TRUE
2157-
------
2158-
t
2159-
(1 row)
2160-
2161-
select md5('12345678901234567890123456789012345678901234567890123456789012345678901234567890') = '57edf4a22be3c955ac49da2e2107b67a' AS "TRUE";
2162-
TRUE
2163-
------
2164-
t
2165-
(1 row)
2166-
2167-
select md5(''::bytea) = 'd41d8cd98f00b204e9800998ecf8427e' AS "TRUE";
2168-
TRUE
2169-
------
2170-
t
2171-
(1 row)
2172-
2173-
select md5('a'::bytea) = '0cc175b9c0f1b6a831c399e269772661' AS "TRUE";
2174-
TRUE
2175-
------
2176-
t
2177-
(1 row)
2178-
2179-
select md5('abc'::bytea) = '900150983cd24fb0d6963f7d28e17f72' AS "TRUE";
2180-
TRUE
2181-
------
2182-
t
2183-
(1 row)
2184-
2185-
select md5('message digest'::bytea) = 'f96b697d7cb7938d525a2f31aaf161d0' AS "TRUE";
2186-
TRUE
2187-
------
2188-
t
2189-
(1 row)
2190-
2191-
select md5('abcdefghijklmnopqrstuvwxyz'::bytea) = 'c3fcd3d76192e4007dfb496cca67e13b' AS "TRUE";
2192-
TRUE
2193-
------
2194-
t
2195-
(1 row)
2196-
2197-
select md5('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'::bytea) = 'd174ab98d277d9f5a5611c2c9f419d9f' AS "TRUE";
2198-
TRUE
2199-
------
2200-
t
2201-
(1 row)
2202-
2203-
select md5('12345678901234567890123456789012345678901234567890123456789012345678901234567890'::bytea) = '57edf4a22be3c955ac49da2e2107b67a' AS "TRUE";
2204-
TRUE
2205-
------
2206-
t
2207-
(1 row)
2208-
22092121
--
22102122
-- SHA-2
22112123
--

‎src/test/regress/parallel_schedule

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ test: boolean char name varchar text int2 int4 int8 oid float4 float8 bit numeri
2626
# multirangetypes depends on rangetypes
2727
# multirangetypes shouldn't run concurrently with type_sanity
2828
# ----------
29-
test: strings numerology point lseg line box path polygon circle date time timetz timestamp timestamptz interval inet macaddr macaddr8 multirangetypes
29+
test: strings md5 numerology point lseg line box path polygon circle date time timetz timestamp timestamptz interval inet macaddr macaddr8 multirangetypes
3030

3131
# ----------
3232
# Another group of parallel tests

‎src/test/regress/sql/md5.sql

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
--
2+
-- MD5 test suite - from IETF RFC 1321
3+
-- (see: https://www.rfc-editor.org/rfc/rfc1321)
4+
--
5+
6+
-- (The md5() function will error in OpenSSL FIPS mode. By keeping
7+
-- this test in a separate file, it is easier to manage variant
8+
-- results.)
9+
10+
select md5('') = 'd41d8cd98f00b204e9800998ecf8427e' AS "TRUE";
11+
12+
select md5('a') = '0cc175b9c0f1b6a831c399e269772661' AS "TRUE";
13+
14+
select md5('abc') = '900150983cd24fb0d6963f7d28e17f72' AS "TRUE";
15+
16+
select md5('message digest') = 'f96b697d7cb7938d525a2f31aaf161d0' AS "TRUE";
17+
18+
select md5('abcdefghijklmnopqrstuvwxyz') = 'c3fcd3d76192e4007dfb496cca67e13b' AS "TRUE";
19+
20+
select md5('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789') = 'd174ab98d277d9f5a5611c2c9f419d9f' AS "TRUE";
21+
22+
select md5('12345678901234567890123456789012345678901234567890123456789012345678901234567890') = '57edf4a22be3c955ac49da2e2107b67a' AS "TRUE";
23+
24+
select md5(''::bytea) = 'd41d8cd98f00b204e9800998ecf8427e' AS "TRUE";
25+
26+
select md5('a'::bytea) = '0cc175b9c0f1b6a831c399e269772661' AS "TRUE";
27+
28+
select md5('abc'::bytea) = '900150983cd24fb0d6963f7d28e17f72' AS "TRUE";
29+
30+
select md5('message digest'::bytea) = 'f96b697d7cb7938d525a2f31aaf161d0' AS "TRUE";
31+
32+
select md5('abcdefghijklmnopqrstuvwxyz'::bytea) = 'c3fcd3d76192e4007dfb496cca67e13b' AS "TRUE";
33+
34+
select md5('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'::bytea) = 'd174ab98d277d9f5a5611c2c9f419d9f' AS "TRUE";
35+
36+
select md5('12345678901234567890123456789012345678901234567890123456789012345678901234567890'::bytea) = '57edf4a22be3c955ac49da2e2107b67a' AS "TRUE";

‎src/test/regress/sql/strings.sql

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -685,38 +685,6 @@ select to_hex(256*256*256 - 1) AS "ffffff";
685685

686686
select to_hex(256::bigint*256::bigint*256::bigint*256::bigint - 1) AS "ffffffff";
687687

688-
--
689-
-- MD5 test suite - from IETF RFC 1321
690-
-- (see: ftp://ftp.rfc-editor.org/in-notes/rfc1321.txt)
691-
--
692-
select md5('') = 'd41d8cd98f00b204e9800998ecf8427e' AS "TRUE";
693-
694-
select md5('a') = '0cc175b9c0f1b6a831c399e269772661' AS "TRUE";
695-
696-
select md5('abc') = '900150983cd24fb0d6963f7d28e17f72' AS "TRUE";
697-
698-
select md5('message digest') = 'f96b697d7cb7938d525a2f31aaf161d0' AS "TRUE";
699-
700-
select md5('abcdefghijklmnopqrstuvwxyz') = 'c3fcd3d76192e4007dfb496cca67e13b' AS "TRUE";
701-
702-
select md5('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789') = 'd174ab98d277d9f5a5611c2c9f419d9f' AS "TRUE";
703-
704-
select md5('12345678901234567890123456789012345678901234567890123456789012345678901234567890') = '57edf4a22be3c955ac49da2e2107b67a' AS "TRUE";
705-
706-
select md5(''::bytea) = 'd41d8cd98f00b204e9800998ecf8427e' AS "TRUE";
707-
708-
select md5('a'::bytea) = '0cc175b9c0f1b6a831c399e269772661' AS "TRUE";
709-
710-
select md5('abc'::bytea) = '900150983cd24fb0d6963f7d28e17f72' AS "TRUE";
711-
712-
select md5('message digest'::bytea) = 'f96b697d7cb7938d525a2f31aaf161d0' AS "TRUE";
713-
714-
select md5('abcdefghijklmnopqrstuvwxyz'::bytea) = 'c3fcd3d76192e4007dfb496cca67e13b' AS "TRUE";
715-
716-
select md5('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'::bytea) = 'd174ab98d277d9f5a5611c2c9f419d9f' AS "TRUE";
717-
718-
select md5('12345678901234567890123456789012345678901234567890123456789012345678901234567890'::bytea) = '57edf4a22be3c955ac49da2e2107b67a' AS "TRUE";
719-
720688
--
721689
-- SHA-2
722690
--

0 commit comments

Comments
 (0)