Mirrors/node
1
0
Fork 0
mirror of https://github.com/nodejs/node.git synced 2025-12-28 16:07:39 +00:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

test: fix tests affected by OpenSSL update

Browse Source 
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>
This commit is contained in:
Michael Dawson 2022-03-15 23:51:19 +00:00 committed by Node.js GitHub Bot
parent 07ee7966ff
commit f1b6d872dd
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/parallel/test-crypto-key-objects.js
View File

@ -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);

11
test/parallel/test-tls-passphrase.js
View File

@ -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() {