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

Commit da61695

Browse files
tglsfdctglsfdc
committed
Mop-up for commit feb8254.
Missed these occurrences of some of the adjusted error messages. Per buildfarm member pademelon.
1 parent e22b27f commit da61695

File tree

4 files changed

+70
-70
lines changed

4 files changed

+70
-70
lines changed

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,25 @@ select pgp_sym_decrypt(
1818
pgp_sym_encrypt('Secret message', 'key', 'compress-algo=0'),
1919
'key', 'expect-compress-algo=0');
2020
ERROR: generating random data is not supported by this build
21-
DETAIL: This functionality requires a source of strong random numbers
22-
HINT: You need to rebuild PostgreSQL using --enable-strong-random
21+
DETAIL: This functionality requires a source of strong random numbers.
22+
HINT: You need to rebuild PostgreSQL using --enable-strong-random.
2323
select pgp_sym_decrypt(
2424
pgp_sym_encrypt('Secret message', 'key', 'compress-algo=1'),
2525
'key', 'expect-compress-algo=1');
2626
ERROR: generating random data is not supported by this build
27-
DETAIL: This functionality requires a source of strong random numbers
28-
HINT: You need to rebuild PostgreSQL using --enable-strong-random
27+
DETAIL: This functionality requires a source of strong random numbers.
28+
HINT: You need to rebuild PostgreSQL using --enable-strong-random.
2929
select pgp_sym_decrypt(
3030
pgp_sym_encrypt('Secret message', 'key', 'compress-algo=2'),
3131
'key', 'expect-compress-algo=2');
3232
ERROR: generating random data is not supported by this build
33-
DETAIL: This functionality requires a source of strong random numbers
34-
HINT: You need to rebuild PostgreSQL using --enable-strong-random
33+
DETAIL: This functionality requires a source of strong random numbers.
34+
HINT: You need to rebuild PostgreSQL using --enable-strong-random.
3535
-- level=0 should turn compression off
3636
select pgp_sym_decrypt(
3737
pgp_sym_encrypt('Secret message', 'key',
3838
'compress-algo=2, compress-level=0'),
3939
'key', 'expect-compress-algo=0');
4040
ERROR: generating random data is not supported by this build
41-
DETAIL: This functionality requires a source of strong random numbers
42-
HINT: You need to rebuild PostgreSQL using --enable-strong-random
41+
DETAIL: This functionality requires a source of strong random numbers.
42+
HINT: You need to rebuild PostgreSQL using --enable-strong-random.

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -367,8 +367,8 @@ a3nsOzKTXUfS9VyaXo8IrncM6n7fdaXpwba/3tNsAhJG4lDv1k4g9v8Ix2dfv6Rs
367367
-- check BUG #11905, problem with messages 6 less than a power of 2.
368368
select pgp_sym_decrypt(pgp_sym_encrypt(repeat('x',65530),'1'),'1') = repeat('x',65530);
369369
ERROR: generating random data is not supported by this build
370-
DETAIL: This functionality requires a source of strong random numbers
371-
HINT: You need to rebuild PostgreSQL using --enable-strong-random
370+
DETAIL: This functionality requires a source of strong random numbers.
371+
HINT: You need to rebuild PostgreSQL using --enable-strong-random.
372372
-- expected: true
373373
-- Negative tests
374374
-- Decryption with a certain incorrect key yields an apparent Literal Data
@@ -390,8 +390,8 @@ ERROR: Wrong key or corrupt data
390390
-- Routine text/binary mismatch.
391391
select pgp_sym_decrypt(pgp_sym_encrypt_bytea('P', 'key'), 'key', 'debug=1');
392392
ERROR: generating random data is not supported by this build
393-
DETAIL: This functionality requires a source of strong random numbers
394-
HINT: You need to rebuild PostgreSQL using --enable-strong-random
393+
DETAIL: This functionality requires a source of strong random numbers.
394+
HINT: You need to rebuild PostgreSQL using --enable-strong-random.
395395
-- Decryption with a certain incorrect key yields an apparent BZip2-compressed
396396
-- plaintext. Ciphertext source: iterative pgp_sym_encrypt('secret', 'key')
397397
-- until the random prefix gave rise to that property.

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

+46-46
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
SET bytea_output TO escape;
66
select pgp_sym_decrypt(pgp_sym_encrypt('Secret.', 'key'), 'key');
77
ERROR: generating random data is not supported by this build
8-
DETAIL: This functionality requires a source of strong random numbers
9-
HINT: You need to rebuild PostgreSQL using --enable-strong-random
8+
DETAIL: This functionality requires a source of strong random numbers.
9+
HINT: You need to rebuild PostgreSQL using --enable-strong-random.
1010
-- check whether the defaults are ok
1111
select pgp_sym_decrypt(pgp_sym_encrypt('Secret.', 'key'),
1212
'key', 'expect-cipher-algo=aes128,
@@ -17,8 +17,8 @@ select pgp_sym_decrypt(pgp_sym_encrypt('Secret.', 'key'),
1717
expect-compress-algo=0
1818
');
1919
ERROR: generating random data is not supported by this build
20-
DETAIL: This functionality requires a source of strong random numbers
21-
HINT: You need to rebuild PostgreSQL using --enable-strong-random
20+
DETAIL: This functionality requires a source of strong random numbers.
21+
HINT: You need to rebuild PostgreSQL using --enable-strong-random.
2222
-- maybe the expect- stuff simply does not work
2323
select pgp_sym_decrypt(pgp_sym_encrypt('Secret.', 'key'),
2424
'key', 'expect-cipher-algo=bf,
@@ -29,133 +29,133 @@ select pgp_sym_decrypt(pgp_sym_encrypt('Secret.', 'key'),
2929
expect-compress-algo=1
3030
');
3131
ERROR: generating random data is not supported by this build
32-
DETAIL: This functionality requires a source of strong random numbers
33-
HINT: You need to rebuild PostgreSQL using --enable-strong-random
32+
DETAIL: This functionality requires a source of strong random numbers.
33+
HINT: You need to rebuild PostgreSQL using --enable-strong-random.
3434
-- bytea as text
3535
select pgp_sym_decrypt(pgp_sym_encrypt_bytea('Binary', 'baz'), 'baz');
3636
ERROR: generating random data is not supported by this build
37-
DETAIL: This functionality requires a source of strong random numbers
38-
HINT: You need to rebuild PostgreSQL using --enable-strong-random
37+
DETAIL: This functionality requires a source of strong random numbers.
38+
HINT: You need to rebuild PostgreSQL using --enable-strong-random.
3939
-- text as bytea
4040
select pgp_sym_decrypt_bytea(pgp_sym_encrypt('Text', 'baz'), 'baz');
4141
ERROR: generating random data is not supported by this build
42-
DETAIL: This functionality requires a source of strong random numbers
43-
HINT: You need to rebuild PostgreSQL using --enable-strong-random
42+
DETAIL: This functionality requires a source of strong random numbers.
43+
HINT: You need to rebuild PostgreSQL using --enable-strong-random.
4444
-- algorithm change
4545
select pgp_sym_decrypt(
4646
pgp_sym_encrypt('Secret.', 'key', 'cipher-algo=bf'),
4747
'key', 'expect-cipher-algo=bf');
4848
ERROR: generating random data is not supported by this build
49-
DETAIL: This functionality requires a source of strong random numbers
50-
HINT: You need to rebuild PostgreSQL using --enable-strong-random
49+
DETAIL: This functionality requires a source of strong random numbers.
50+
HINT: You need to rebuild PostgreSQL using --enable-strong-random.
5151
select pgp_sym_decrypt(
5252
pgp_sym_encrypt('Secret.', 'key', 'cipher-algo=aes'),
5353
'key', 'expect-cipher-algo=aes128');
5454
ERROR: generating random data is not supported by this build
55-
DETAIL: This functionality requires a source of strong random numbers
56-
HINT: You need to rebuild PostgreSQL using --enable-strong-random
55+
DETAIL: This functionality requires a source of strong random numbers.
56+
HINT: You need to rebuild PostgreSQL using --enable-strong-random.
5757
select pgp_sym_decrypt(
5858
pgp_sym_encrypt('Secret.', 'key', 'cipher-algo=aes192'),
5959
'key', 'expect-cipher-algo=aes192');
6060
ERROR: generating random data is not supported by this build
61-
DETAIL: This functionality requires a source of strong random numbers
62-
HINT: You need to rebuild PostgreSQL using --enable-strong-random
61+
DETAIL: This functionality requires a source of strong random numbers.
62+
HINT: You need to rebuild PostgreSQL using --enable-strong-random.
6363
-- s2k change
6464
select pgp_sym_decrypt(
6565
pgp_sym_encrypt('Secret.', 'key', 's2k-mode=0'),
6666
'key', 'expect-s2k-mode=0');
6767
ERROR: generating random data is not supported by this build
68-
DETAIL: This functionality requires a source of strong random numbers
69-
HINT: You need to rebuild PostgreSQL using --enable-strong-random
68+
DETAIL: This functionality requires a source of strong random numbers.
69+
HINT: You need to rebuild PostgreSQL using --enable-strong-random.
7070
select pgp_sym_decrypt(
7171
pgp_sym_encrypt('Secret.', 'key', 's2k-mode=1'),
7272
'key', 'expect-s2k-mode=1');
7373
ERROR: generating random data is not supported by this build
74-
DETAIL: This functionality requires a source of strong random numbers
75-
HINT: You need to rebuild PostgreSQL using --enable-strong-random
74+
DETAIL: This functionality requires a source of strong random numbers.
75+
HINT: You need to rebuild PostgreSQL using --enable-strong-random.
7676
select pgp_sym_decrypt(
7777
pgp_sym_encrypt('Secret.', 'key', 's2k-mode=3'),
7878
'key', 'expect-s2k-mode=3');
7979
ERROR: generating random data is not supported by this build
80-
DETAIL: This functionality requires a source of strong random numbers
81-
HINT: You need to rebuild PostgreSQL using --enable-strong-random
80+
DETAIL: This functionality requires a source of strong random numbers.
81+
HINT: You need to rebuild PostgreSQL using --enable-strong-random.
8282
-- s2k count change
8383
select pgp_sym_decrypt(
8484
pgp_sym_encrypt('Secret.', 'key', 's2k-count=1024'),
8585
'key', 'expect-s2k-count=1024');
8686
ERROR: generating random data is not supported by this build
87-
DETAIL: This functionality requires a source of strong random numbers
88-
HINT: You need to rebuild PostgreSQL using --enable-strong-random
87+
DETAIL: This functionality requires a source of strong random numbers.
88+
HINT: You need to rebuild PostgreSQL using --enable-strong-random.
8989
-- s2k_count rounds up
9090
select pgp_sym_decrypt(
9191
pgp_sym_encrypt('Secret.', 'key', 's2k-count=65000000'),
9292
'key', 'expect-s2k-count=65000000');
9393
ERROR: generating random data is not supported by this build
94-
DETAIL: This functionality requires a source of strong random numbers
95-
HINT: You need to rebuild PostgreSQL using --enable-strong-random
94+
DETAIL: This functionality requires a source of strong random numbers.
95+
HINT: You need to rebuild PostgreSQL using --enable-strong-random.
9696
-- s2k digest change
9797
select pgp_sym_decrypt(
9898
pgp_sym_encrypt('Secret.', 'key', 's2k-digest-algo=md5'),
9999
'key', 'expect-s2k-digest-algo=md5');
100100
ERROR: generating random data is not supported by this build
101-
DETAIL: This functionality requires a source of strong random numbers
102-
HINT: You need to rebuild PostgreSQL using --enable-strong-random
101+
DETAIL: This functionality requires a source of strong random numbers.
102+
HINT: You need to rebuild PostgreSQL using --enable-strong-random.
103103
select pgp_sym_decrypt(
104104
pgp_sym_encrypt('Secret.', 'key', 's2k-digest-algo=sha1'),
105105
'key', 'expect-s2k-digest-algo=sha1');
106106
ERROR: generating random data is not supported by this build
107-
DETAIL: This functionality requires a source of strong random numbers
108-
HINT: You need to rebuild PostgreSQL using --enable-strong-random
107+
DETAIL: This functionality requires a source of strong random numbers.
108+
HINT: You need to rebuild PostgreSQL using --enable-strong-random.
109109
-- sess key
110110
select pgp_sym_decrypt(
111111
pgp_sym_encrypt('Secret.', 'key', 'sess-key=0'),
112112
'key', 'expect-sess-key=0');
113113
ERROR: generating random data is not supported by this build
114-
DETAIL: This functionality requires a source of strong random numbers
115-
HINT: You need to rebuild PostgreSQL using --enable-strong-random
114+
DETAIL: This functionality requires a source of strong random numbers.
115+
HINT: You need to rebuild PostgreSQL using --enable-strong-random.
116116
select pgp_sym_decrypt(
117117
pgp_sym_encrypt('Secret.', 'key', 'sess-key=1'),
118118
'key', 'expect-sess-key=1');
119119
ERROR: generating random data is not supported by this build
120-
DETAIL: This functionality requires a source of strong random numbers
121-
HINT: You need to rebuild PostgreSQL using --enable-strong-random
120+
DETAIL: This functionality requires a source of strong random numbers.
121+
HINT: You need to rebuild PostgreSQL using --enable-strong-random.
122122
select pgp_sym_decrypt(
123123
pgp_sym_encrypt('Secret.', 'key', 'sess-key=1, cipher-algo=bf'),
124124
'key', 'expect-sess-key=1, expect-cipher-algo=bf');
125125
ERROR: generating random data is not supported by this build
126-
DETAIL: This functionality requires a source of strong random numbers
127-
HINT: You need to rebuild PostgreSQL using --enable-strong-random
126+
DETAIL: This functionality requires a source of strong random numbers.
127+
HINT: You need to rebuild PostgreSQL using --enable-strong-random.
128128
select pgp_sym_decrypt(
129129
pgp_sym_encrypt('Secret.', 'key', 'sess-key=1, cipher-algo=aes192'),
130130
'key', 'expect-sess-key=1, expect-cipher-algo=aes192');
131131
ERROR: generating random data is not supported by this build
132-
DETAIL: This functionality requires a source of strong random numbers
133-
HINT: You need to rebuild PostgreSQL using --enable-strong-random
132+
DETAIL: This functionality requires a source of strong random numbers.
133+
HINT: You need to rebuild PostgreSQL using --enable-strong-random.
134134
select pgp_sym_decrypt(
135135
pgp_sym_encrypt('Secret.', 'key', 'sess-key=1, cipher-algo=aes256'),
136136
'key', 'expect-sess-key=1, expect-cipher-algo=aes256');
137137
ERROR: generating random data is not supported by this build
138-
DETAIL: This functionality requires a source of strong random numbers
139-
HINT: You need to rebuild PostgreSQL using --enable-strong-random
138+
DETAIL: This functionality requires a source of strong random numbers.
139+
HINT: You need to rebuild PostgreSQL using --enable-strong-random.
140140
-- no mdc
141141
select pgp_sym_decrypt(
142142
pgp_sym_encrypt('Secret.', 'key', 'disable-mdc=1'),
143143
'key', 'expect-disable-mdc=1');
144144
ERROR: generating random data is not supported by this build
145-
DETAIL: This functionality requires a source of strong random numbers
146-
HINT: You need to rebuild PostgreSQL using --enable-strong-random
145+
DETAIL: This functionality requires a source of strong random numbers.
146+
HINT: You need to rebuild PostgreSQL using --enable-strong-random.
147147
-- crlf
148148
select encode(pgp_sym_decrypt_bytea(
149149
pgp_sym_encrypt(E'1\n2\n3\r\n', 'key', 'convert-crlf=1'),
150150
'key'), 'hex');
151151
ERROR: generating random data is not supported by this build
152-
DETAIL: This functionality requires a source of strong random numbers
153-
HINT: You need to rebuild PostgreSQL using --enable-strong-random
152+
DETAIL: This functionality requires a source of strong random numbers.
153+
HINT: You need to rebuild PostgreSQL using --enable-strong-random.
154154
-- conversion should be lossless
155155
select encode(digest(pgp_sym_decrypt(
156156
pgp_sym_encrypt(E'\r\n0\n1\r\r\n\n2\r', 'key', 'convert-crlf=1'),
157157
'key', 'convert-crlf=1'), 'sha1'), 'hex') as result,
158158
encode(digest(E'\r\n0\n1\r\r\n\n2\r', 'sha1'), 'hex') as expect;
159159
ERROR: generating random data is not supported by this build
160-
DETAIL: This functionality requires a source of strong random numbers
161-
HINT: You need to rebuild PostgreSQL using --enable-strong-random
160+
DETAIL: This functionality requires a source of strong random numbers.
161+
HINT: You need to rebuild PostgreSQL using --enable-strong-random.

‎contrib/pgcrypto/expected/pgp-pubkey-encrypt_1.out

+12-12
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,29 @@ select pgp_pub_decrypt(
99
dearmor(seckey))
1010
from keytbl where keytbl.id=1;
1111
ERROR: generating random data is not supported by this build
12-
DETAIL: This functionality requires a source of strong random numbers
13-
HINT: You need to rebuild PostgreSQL using --enable-strong-random
12+
DETAIL: This functionality requires a source of strong random numbers.
13+
HINT: You need to rebuild PostgreSQL using --enable-strong-random.
1414
select pgp_pub_decrypt(
1515
pgp_pub_encrypt('Secret msg', dearmor(pubkey)),
1616
dearmor(seckey))
1717
from keytbl where keytbl.id=2;
1818
ERROR: generating random data is not supported by this build
19-
DETAIL: This functionality requires a source of strong random numbers
20-
HINT: You need to rebuild PostgreSQL using --enable-strong-random
19+
DETAIL: This functionality requires a source of strong random numbers.
20+
HINT: You need to rebuild PostgreSQL using --enable-strong-random.
2121
select pgp_pub_decrypt(
2222
pgp_pub_encrypt('Secret msg', dearmor(pubkey)),
2323
dearmor(seckey))
2424
from keytbl where keytbl.id=3;
2525
ERROR: generating random data is not supported by this build
26-
DETAIL: This functionality requires a source of strong random numbers
27-
HINT: You need to rebuild PostgreSQL using --enable-strong-random
26+
DETAIL: This functionality requires a source of strong random numbers.
27+
HINT: You need to rebuild PostgreSQL using --enable-strong-random.
2828
select pgp_pub_decrypt(
2929
pgp_pub_encrypt('Secret msg', dearmor(pubkey)),
3030
dearmor(seckey))
3131
from keytbl where keytbl.id=6;
3232
ERROR: generating random data is not supported by this build
33-
DETAIL: This functionality requires a source of strong random numbers
34-
HINT: You need to rebuild PostgreSQL using --enable-strong-random
33+
DETAIL: This functionality requires a source of strong random numbers.
34+
HINT: You need to rebuild PostgreSQL using --enable-strong-random.
3535
-- try with rsa-sign only
3636
select pgp_pub_decrypt(
3737
pgp_pub_encrypt('Secret msg', dearmor(pubkey)),
@@ -50,13 +50,13 @@ select pgp_pub_decrypt_bytea(
5050
dearmor(seckey))
5151
from keytbl where keytbl.id=1;
5252
ERROR: generating random data is not supported by this build
53-
DETAIL: This functionality requires a source of strong random numbers
54-
HINT: You need to rebuild PostgreSQL using --enable-strong-random
53+
DETAIL: This functionality requires a source of strong random numbers.
54+
HINT: You need to rebuild PostgreSQL using --enable-strong-random.
5555
-- and bytea-to-text?
5656
select pgp_pub_decrypt(
5757
pgp_pub_encrypt_bytea('Secret msg', dearmor(pubkey)),
5858
dearmor(seckey))
5959
from keytbl where keytbl.id=1;
6060
ERROR: generating random data is not supported by this build
61-
DETAIL: This functionality requires a source of strong random numbers
62-
HINT: You need to rebuild PostgreSQL using --enable-strong-random
61+
DETAIL: This functionality requires a source of strong random numbers.
62+
HINT: You need to rebuild PostgreSQL using --enable-strong-random.

0 commit comments

Comments
 (0)