diff options
| author | Michael Dawson <midawson@redhat.com> | 2022-03-16 02:51:19 +0300 |
|---|---|---|
| committer | Richard Lau <rlau@redhat.com> | 2022-03-17 19:25:55 +0300 |
| commit | c8b6d92af02206913d3223ce3f4700f460f40696 (patch) | |
| tree | 2c774f93cf9c4a268f0180bd790b4a3210cccce3 | |
| parent | 55e293e05fac764eae7f0a533125c3e3a067a092 (diff) | |
test: fix tests affected by OpenSSL update
Last OpenSSL 3 update changes behaviour back to be
closer to that of OpenSSL 1.1.1. Remove some instances
where we expected different errors from OpenSSL 3 versus
OpenSSL 1.1.1.
Signed-off-by: Michael Dawson <midawson@redhat.com>
PR-URL: https://github.com/nodejs/node/pull/42356
Refs: https://mta.openssl.org/pipermail/openssl-announce/2022-March/000217.html
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Darshan Sen <raisinten@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Michael Dawson <midawson@redhat.com>
| -rw-r--r-- | test/parallel/test-crypto-key-objects.js | 4 | ||||
| -rw-r--r-- | test/parallel/test-tls-passphrase.js | 11 |
2 files changed, 5 insertions, 10 deletions
diff --git a/test/parallel/test-crypto-key-objects.js b/test/parallel/test-crypto-key-objects.js index e543ff730dc..40a982ea7b6 100644 --- a/test/parallel/test-crypto-key-objects.js +++ b/test/parallel/test-crypto-key-objects.js @@ -546,9 +546,7 @@ const privateDsa = fixtures.readKey('dsa_private_encrypted_1025.pem', format: 'pem', passphrase: Buffer.alloc(1024, 'a') }), { - message: common.hasOpenSSL3 ? - 'error:07880109:common libcrypto routines::interrupted or cancelled' : - /bad decrypt/ + message: /bad decrypt/ }); const publicKey = createPublicKey(publicDsa); diff --git a/test/parallel/test-tls-passphrase.js b/test/parallel/test-tls-passphrase.js index ce77dd18a6e..8d802400f6e 100644 --- a/test/parallel/test-tls-passphrase.js +++ b/test/parallel/test-tls-passphrase.js @@ -223,8 +223,7 @@ server.listen(0, common.mustCall(function() { }, onSecureConnect()); })).unref(); -const errMessagePassword = common.hasOpenSSL3 ? - /Error: error:1400006B:UI routines::processing error/ : /bad decrypt/; +const errMessageDecrypt = /bad decrypt/; // Missing passphrase assert.throws(function() { @@ -234,7 +233,7 @@ assert.throws(function() { cert: cert, rejectUnauthorized: false }); -}, errMessagePassword); +}, errMessageDecrypt); assert.throws(function() { tls.connect({ @@ -243,7 +242,7 @@ assert.throws(function() { cert: cert, rejectUnauthorized: false }); -}, errMessagePassword); +}, errMessageDecrypt); assert.throws(function() { tls.connect({ @@ -252,9 +251,7 @@ assert.throws(function() { cert: cert, rejectUnauthorized: false }); -}, errMessagePassword); - -const errMessageDecrypt = /bad decrypt/; +}, errMessageDecrypt); // Invalid passphrase assert.throws(function() { |