1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: move dherror.pem to fixtures/keys/

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/27962
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
This commit is contained in:
Alex Aubuchon 2019-05-29 12:07:53 -07:00 committed by Ali Ijaz Sheikh
parent 6adeae686c
commit b4225615ad
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/fixtures/keys/Makefile vendored
View File

@ -24,6 +24,7 @@ all: \
dh512.pem \ dh512.pem \
dh1024.pem \ dh1024.pem \
dh2048.pem \ dh2048.pem \
dherror.pem \
dsa_params.pem \ dsa_params.pem \
dsa_private.pem \ dsa_private.pem \
dsa_private_encrypted.pem \ dsa_private_encrypted.pem \
@ -578,6 +579,9 @@ dh1024.pem:
dh2048.pem: dh2048.pem:
openssl dhparam -out dh2048.pem 2048 openssl dhparam -out dh2048.pem 2048
dherror.pem: dh512.pem
sed 's/^[^-].*/AAAAAAAAAA/g' dh512.pem > dherror.pem
dsa_params.pem: dsa_params.pem:
openssl dsaparam -out dsa_params.pem 2048 openssl dsaparam -out dsa_params.pem 2048

3
test/fixtures/dherror.pem → test/fixtures/keys/dherror.pem vendored
View File

@ -1,3 +1,4 @@
-----BEGIN DH PARAMETERS----- -----BEGIN DH PARAMETERS-----
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAA
AAAAAAAAAA
-----END DH PARAMETERS----- -----END DH PARAMETERS-----

6
test/parallel/test-tls-dhe.js
View File

@ -44,10 +44,8 @@ common.expectWarning('SecurityWarning',
'DH parameter is less than 2048 bits'); 'DH parameter is less than 2048 bits');
function loadDHParam(n) { function loadDHParam(n) {
const params = [`dh${n}.pem`]; const keyname = `dh${n}.pem`;
if (n !== 'error') return fixtures.readKey(keyname);
params.unshift('keys');
return fixtures.readSync(params);
} }
function test(keylen, expectedCipher, cb) { function test(keylen, expectedCipher, cb) {