Skip to content

Commit

Permalink
test: fix error messages for OpenSSL-1.1.0i
Browse files Browse the repository at this point in the history
After upgradeing OpenSSL-1.1.0i, two tests are failed due to changes
of error messages.

Ref: openssl/openssl@45ae18b
Ref: openssl/openssl@36d2517
PR-URL: #22318
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rod Vagg <rod@vagg.org>
  • Loading branch information
shigeki authored and rvagg committed Aug 15, 2018
1 parent 1ce3887 commit 1ed03b0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions test/parallel/test-crypto-scrypt.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,15 @@ const good = [
const bad = [
{ N: 1, p: 1, r: 1 }, // N < 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
{ p: 1, parallelization: 1 }, // both p and parallelization
{ r: 1, blockSize: 1 } // both r and blocksize
];

// Test vectors where 128*N*r exceeds maxmem.
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 ** 10, p: 1, r: 8, maxmem: 2 ** 20 },
];
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-tls-passphrase.js
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ server.listen(0, common.mustCall(function() {
}, common.mustCall());
})).unref();

const errMessagePassword = /bad password read/;
const errMessagePassword = /bad decrypt/;

// Missing passphrase
assert.throws(function() {
Expand Down

0 comments on commit 1ed03b0

Please sign in to comment.