diff options
| author | Shigeki Ohtsu <ohtsu@ohtsu.org> | 2018-08-15 00:03:03 +0900 |
|---|---|---|
| committer | Rod Vagg <rod@vagg.org> | 2018-08-16 11:52:38 +1000 |
| commit | 19246de748ccc529751a78c87ae44066feffd9c0 (patch) | |
| tree | 29f83905ab9085633c772be1f1bf2db5b03713c9 /test/parallel/test-crypto-scrypt.js | |
| parent | eaa0ad97872ac1becf437c14909afe7a01b77364 (diff) | |
| download | android-node-v8-19246de748ccc529751a78c87ae44066feffd9c0.tar.gz android-node-v8-19246de748ccc529751a78c87ae44066feffd9c0.tar.bz2 android-node-v8-19246de748ccc529751a78c87ae44066feffd9c0.zip | |
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 <jasnell@gmail.com>
Reviewed-By: Rod Vagg <rod@vagg.org>
Diffstat (limited to 'test/parallel/test-crypto-scrypt.js')
| -rw-r--r-- | test/parallel/test-crypto-scrypt.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/parallel/test-crypto-scrypt.js b/test/parallel/test-crypto-scrypt.js index a99bff9255..982b0ac6d5 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 }, ]; |