diff options
| author | Alex Aubuchon <alex@aub.dev> | 2019-05-29 12:07:53 -0700 |
|---|---|---|
| committer | Rich Trott <rtrott@gmail.com> | 2019-06-10 09:57:12 -0700 |
| commit | 9830afe7f717901fdefb09b43eb61b444aea04a4 (patch) | |
| tree | 696d4440acc1e038bc3d82a1f5c940890e568daf /test | |
| parent | 7b221fb3cd690b7a0f27b9eb53371aca9ec9af95 (diff) | |
| download | android-node-v8-9830afe7f717901fdefb09b43eb61b444aea04a4.tar.gz android-node-v8-9830afe7f717901fdefb09b43eb61b444aea04a4.tar.bz2 android-node-v8-9830afe7f717901fdefb09b43eb61b444aea04a4.zip | |
test: move dherror.pem to fixtures/keys/
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>
Diffstat (limited to 'test')
| -rw-r--r-- | test/fixtures/keys/Makefile | 4 | ||||
| -rw-r--r-- | test/fixtures/keys/dherror.pem (renamed from test/fixtures/dherror.pem) | 3 | ||||
| -rw-r--r-- | test/parallel/test-tls-dhe.js | 6 |
3 files changed, 8 insertions, 5 deletions
diff --git a/test/fixtures/keys/Makefile b/test/fixtures/keys/Makefile index d26872e7d5..198c8e2bd0 100644 --- a/test/fixtures/keys/Makefile +++ b/test/fixtures/keys/Makefile @@ -24,6 +24,7 @@ all: \ dh512.pem \ dh1024.pem \ dh2048.pem \ + dherror.pem \ dsa_params.pem \ dsa_private.pem \ dsa_private_encrypted.pem \ @@ -578,6 +579,9 @@ dh1024.pem: dh2048.pem: openssl dhparam -out dh2048.pem 2048 +dherror.pem: dh512.pem + sed 's/^[^-].*/AAAAAAAAAA/g' dh512.pem > dherror.pem + dsa_params.pem: openssl dsaparam -out dsa_params.pem 2048 diff --git a/test/fixtures/dherror.pem b/test/fixtures/keys/dherror.pem index 455795fc6c..4f56268d19 100644 --- a/test/fixtures/dherror.pem +++ b/test/fixtures/keys/dherror.pem @@ -1,3 +1,4 @@ -----BEGIN DH PARAMETERS----- -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAA +AAAAAAAAAA -----END DH PARAMETERS----- diff --git a/test/parallel/test-tls-dhe.js b/test/parallel/test-tls-dhe.js index 8686863350..ef645ce1b6 100644 --- a/test/parallel/test-tls-dhe.js +++ b/test/parallel/test-tls-dhe.js @@ -44,10 +44,8 @@ common.expectWarning('SecurityWarning', 'DH parameter is less than 2048 bits'); function loadDHParam(n) { - const params = [`dh${n}.pem`]; - if (n !== 'error') - params.unshift('keys'); - return fixtures.readSync(params); + const keyname = `dh${n}.pem`; + return fixtures.readKey(keyname); } function test(keylen, expectedCipher, cb) { |