From 19246de748ccc529751a78c87ae44066feffd9c0 Mon Sep 17 00:00:00 2001 From: Shigeki Ohtsu Date: Wed, 15 Aug 2018 00:03:03 +0900 Subject: [PATCH] test: fix error messages for OpenSSL-1.1.0i After upgradeing OpenSSL-1.1.0i, two tests are failed due to changes of error messages. Ref: https://github.com/openssl/openssl/commit/45ae18b38401a027f231f1408e71b13ff3111021 Ref: https://github.com/openssl/openssl/commit/36d2517a97f6020049116492b4d5491d177e629c PR-URL: https://github.com/nodejs/node/pull/22318 Reviewed-By: James M Snell Reviewed-By: Rod Vagg --- test/parallel/test-crypto-scrypt.js | 4 ++-- test/parallel/test-tls-passphrase.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/parallel/test-crypto-scrypt.js b/test/parallel/test-crypto-scrypt.js index a99bff9255f97a..982b0ac6d5b640 100644 --- a/test/parallel/test-crypto-scrypt.js +++ b/test/parallel/test-crypto-scrypt.js @@ -95,8 +95,6 @@ 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 @@ -104,6 +102,8 @@ const bad = [ // 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 }, ]; diff --git a/test/parallel/test-tls-passphrase.js b/test/parallel/test-tls-passphrase.js index b183309af71457..6ed19c74d22f73 100644 --- a/test/parallel/test-tls-passphrase.js +++ b/test/parallel/test-tls-passphrase.js @@ -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() {