Commit 1ed03b0
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: 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>1 parent 1ce3887 commit 1ed03b0
2 files changed
Lines changed: 3 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -95,15 +95,15 @@ const good = [ | |||
| 95 | 95 | const bad = [ | |
| 96 | 96 | { N: 1, p: 1, r: 1 }, // N < 2 | |
| 97 | 97 | { N: 3, p: 1, r: 1 }, // Not power of 2. | |
| 98 | - { N: 2 ** 16, p: 1, r: 1 }, // N >= 2**(r*16) | ||
| 99 | - { N: 2, p: 2 ** 30, r: 1 }, // p > (2**30-1)/r | ||
| 100 | 98 | { N: 1, cost: 1 }, // both N and cost | |
| 101 | 99 | { p: 1, parallelization: 1 }, // both p and parallelization | |
| 102 | 100 | { r: 1, blockSize: 1 } // both r and blocksize | |
| 103 | 101 | ]; | |
| 104 | 102 | ||
| 105 | 103 | // Test vectors where 128*N*r exceeds maxmem. | |
| 106 | 104 | const toobig = [ | |
| 105 | + { N: 2 ** 16, p: 1, r: 1 }, // N >= 2**(r*16) | ||
| 106 | + { N: 2, p: 2 ** 30, r: 1 }, // p > (2**30-1)/r | ||
| 107 | 107 | { N: 2 ** 20, p: 1, r: 8 }, | |
| 108 | 108 | { N: 2 ** 10, p: 1, r: 8, maxmem: 2 ** 20 }, | |
| 109 | 109 | ]; | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -221,7 +221,7 @@ server.listen(0, common.mustCall(function() { | |||
| 221 | 221 | }, common.mustCall()); | |
| 222 | 222 | })).unref(); | |
| 223 | 223 | ||
| 224 | - const errMessagePassword = /bad password read/; | ||
| 224 | + const errMessagePassword = /bad decrypt/; | ||
| 225 | 225 | ||
| 226 | 226 | // Missing passphrase | |
| 227 | 227 | assert.throws(function() { | |
0 commit comments