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

test: fix error messages for OpenSSL-1.1.0i

Browse Source 
After upgradeing OpenSSL-1.1.0i, two tests are failed due to changes
of error messages.

Ref: 45ae18b384
Ref: 36d2517a97
PR-URL: https://github.com/nodejs/node/pull/22318
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rod Vagg <rod@vagg.org>
This commit is contained in:
Shigeki Ohtsu 2018-08-15 00:03:03 +09:00 committed by Rod Vagg
parent eaa0ad9787
commit 19246de748
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/parallel/test-crypto-scrypt.js
View File

@ -95,8 +95,6 @@ const good = [
const bad = [ const bad = [
{ N: 1, p: 1, r: 1 }, // N < 2 { N: 1, p: 1, r: 1 }, // N < 2
{ N: 3, p: 1, r: 1 }, // Not power of 2. { N: 3, p: 1, r: 1 }, // Not power of 2.
{ N: 2 ** 16, p: 1, r: 1 }, // N >= 2**(r*16)
{ N: 2, p: 2 ** 30, r: 1 }, // p > (2**30-1)/r
{ N: 1, cost: 1 }, // both N and cost { N: 1, cost: 1 }, // both N and cost
{ p: 1, parallelization: 1 }, // both p and parallelization { p: 1, parallelization: 1 }, // both p and parallelization
{ r: 1, blockSize: 1 } // both r and blocksize { r: 1, blockSize: 1 } // both r and blocksize
@ -104,6 +102,8 @@ const bad = [
// Test vectors where 128*N*r exceeds maxmem. // Test vectors where 128*N*r exceeds maxmem.
const toobig = [ const toobig = [
{ N: 2 ** 16, p: 1, r: 1 }, // N >= 2**(r*16)
{ N: 2, p: 2 ** 30, r: 1 }, // p > (2**30-1)/r
{ N: 2 ** 20, p: 1, r: 8 }, { N: 2 ** 20, p: 1, r: 8 },
{ N: 2 ** 10, p: 1, r: 8, maxmem: 2 ** 20 }, { N: 2 ** 10, p: 1, r: 8, maxmem: 2 ** 20 },
]; ];

2
test/parallel/test-tls-passphrase.js
View File

@ -221,7 +221,7 @@ server.listen(0, common.mustCall(function() {
}, common.mustCall()); }, common.mustCall());
})).unref(); })).unref();
const errMessagePassword = /bad password read/; const errMessagePassword = /bad decrypt/;
// Missing passphrase // Missing passphrase
assert.throws(function() { assert.throws(function() {