Skip to content

Commit d37dceb

Browse files
mhdawsonhassaanp
authored andcommitted
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 <[email protected]>
1 parent 3361921 commit d37dceb

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

test/parallel/test-crypto-key-objects.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -546,9 +546,7 @@ const privateDsa = fixtures.readKey('dsa_private_encrypted_1025.pem',
546546
format: 'pem',
547547
passphrase: Buffer.alloc(1024, 'a')
548548
}), {
549-
message: common.hasOpenSSL3 ?
550-
'error:07880109:common libcrypto routines::interrupted or cancelled' :
551-
/bad decrypt/
549+
message: /bad decrypt/
552550
});
553551

554552
const publicKey = createPublicKey(publicDsa);

test/parallel/test-tls-passphrase.js

+4-7
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,7 @@ server.listen(0, common.mustCall(function() {
223223
}, onSecureConnect());
224224
})).unref();
225225

226-
const errMessagePassword = common.hasOpenSSL3 ?
227-
/Error: error:1400006B:UI routines::processing error/ : /bad decrypt/;
226+
const errMessageDecrypt = /bad decrypt/;
228227

229228
// Missing passphrase
230229
assert.throws(function() {
@@ -234,7 +233,7 @@ assert.throws(function() {
234233
cert: cert,
235234
rejectUnauthorized: false
236235
});
237-
}, errMessagePassword);
236+
}, errMessageDecrypt);
238237

239238
assert.throws(function() {
240239
tls.connect({
@@ -243,7 +242,7 @@ assert.throws(function() {
243242
cert: cert,
244243
rejectUnauthorized: false
245244
});
246-
}, errMessagePassword);
245+
}, errMessageDecrypt);
247246

248247
assert.throws(function() {
249248
tls.connect({
@@ -252,9 +251,7 @@ assert.throws(function() {
252251
cert: cert,
253252
rejectUnauthorized: false
254253
});
255-
}, errMessagePassword);
256-
257-
const errMessageDecrypt = /bad decrypt/;
254+
}, errMessageDecrypt);
258255

259256
// Invalid passphrase
260257
assert.throws(function() {

0 commit comments

Comments
 (0)