Skip to content

Commit 6ddbb99

Browse files
panvaaduh95
panva
authored and
aduh95
committed
doc,test: account for OpenSSL 4.1 behaviours
Signed-off-by: Filip Skokan <[email protected]> PR-URL: #65956 Refs: https://openssl-library.org/post/2026-09-09-openssl-4.1-alpha/ Reviewed-By: Tim Perry <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
1 parent bfa6d49 commit 6ddbb99

4 files changed

Lines changed: 31 additions & 14 deletions

File tree

‎doc/api/crypto.md‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3022,8 +3022,7 @@ changes:
30223022
Checks whether the certificate matches the given email address.
30233023

30243024
If the `'subject'` option is undefined or set to `'default'`, the certificate
3025-
subject is only considered if the subject alternative name extension either does
3026-
not exist or does not contain any email addresses.
3025+
subject is considered according to OpenSSL's default behavior.
30273026

30283027
If the `'subject'` option is set to `'always'` and if the subject alternative
30293028
name extension either does not exist or does not contain a matching email
@@ -3067,9 +3066,7 @@ comparisons are case-insensitive, the returned subject name might also differ
30673066
from the given `name` in capitalization.
30683067

30693068
If the `'subject'` option is undefined or set to `'default'`, the certificate
3070-
subject is only considered if the subject alternative name extension either does
3071-
not exist or does not contain any DNS names. This behavior is consistent with
3072-
[RFC 2818][] ("HTTP Over TLS").
3069+
subject is considered according to OpenSSL's default behavior.
30733070

30743071
If the `'subject'` option is set to `'always'` and if the subject alternative
30753072
name extension either does not exist or does not contain a matching DNS name,
@@ -7538,7 +7535,6 @@ See the [list of SSL OP Flags][] for details.
75387535
[Permission Model]: permissions.md#permission-model
75397536
[RFC 1421]: https://www.rfc-editor.org/rfc/rfc1421.txt
75407537
[RFC 2409]: https://www.rfc-editor.org/rfc/rfc2409.txt
7541-
[RFC 2818]: https://www.rfc-editor.org/rfc/rfc2818.txt
75427538
[RFC 3526]: https://www.rfc-editor.org/rfc/rfc3526.txt
75437539
[RFC 3610]: https://www.rfc-editor.org/rfc/rfc3610.txt
75447540
[RFC 4055]: https://www.rfc-editor.org/rfc/rfc4055.txt

‎test/parallel/test-crypto-authenticated.js‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ const TEST_CASES = require(fixtures.path('aead-vectors.js'));
4444

4545
const errMessages = {
4646
auth: / auth/,
47+
// OpenSSL 4.1 adds a provider error for AEAD tag mismatches.
48+
// https://github.com/openssl/openssl/pull/32587
49+
badDecrypt: hasOpenSSL(4, 1) ?
50+
{ code: 'ERR_OSSL_BAD_DECRYPT' } : /Unsupported state or unable to authenticate data/,
4751
state: / state/,
4852
FIPS: /not supported in FIPS mode/,
4953
length: /Invalid initialization vector/,
@@ -128,7 +132,8 @@ for (const test of TEST_CASES) {
128132
assert.strictEqual(msg, test.plain);
129133
} else {
130134
// Assert that final throws if input data could not be verified!
131-
assert.throws(function() { decrypt.final('hex'); }, errMessages.auth);
135+
assert.throws(function() { decrypt.final('hex'); },
136+
isCCM || isSIV ? errMessages.auth : errMessages.badDecrypt);
132137
}
133138
}
134139
}
@@ -358,7 +363,8 @@ for (const test of TEST_CASES) {
358363
decipher.update(ciphertext);
359364
assert.throws(() => {
360365
decipher.final();
361-
}, /Unsupported state or unable to authenticate data/);
366+
}, algo === 'aes-128-siv' ?
367+
/Unsupported state or unable to authenticate data/ : errMessages.badDecrypt);
362368
}
363369
}
364370
}
@@ -969,7 +975,7 @@ if (!fips3 && !isBoringSSL) {
969975

970976
assert.throws(() => {
971977
decipher.final();
972-
}, /Unsupported state or unable to authenticate data/);
978+
}, errMessages.badDecrypt);
973979
} else {
974980
common.printSkipMessage('Skipping unsupported chacha20-poly1305 test');
975981
}

‎test/parallel/test-crypto-x509.js‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,21 @@ const der = Buffer.from(
175175

176176
assert.strictEqual(x509.checkIP('127.0.0.1'), undefined);
177177
assert.strictEqual(x509.checkIP('::'), undefined);
178-
assert.strictEqual(x509.checkHost('agent1'), 'agent1');
178+
// OpenSSL 4.1 no longer checks the subject DN by default.
179+
// https://github.com/openssl/openssl/pull/31982
180+
for (const options of [undefined, { subject: 'default' }]) {
181+
assert.strictEqual(x509.checkHost('agent1', options),
182+
hasOpenSSL(4, 1) ? undefined : 'agent1');
183+
assert.strictEqual(x509.checkEmail('[email protected]', options),
184+
hasOpenSSL(4, 1) ? undefined : '[email protected]');
185+
}
186+
assert.strictEqual(x509.checkHost('agent1', { subject: 'always' }), 'agent1');
187+
assert.strictEqual(x509.checkHost('agent1', { subject: 'never' }), undefined);
179188
assert.strictEqual(x509.checkHost('agent2'), undefined);
180-
assert.strictEqual(x509.checkEmail('[email protected]'), '[email protected]');
189+
assert.strictEqual(x509.checkEmail('[email protected]', { subject: 'always' }),
190+
'[email protected]');
191+
assert.strictEqual(x509.checkEmail('[email protected]', { subject: 'never' }),
192+
undefined);
181193
assert.strictEqual(x509.checkEmail('[email protected]'), undefined);
182194
assert.throws(() => x509.checkHost('agent\x001'), {
183195
code: 'ERR_INVALID_ARG_VALUE'

‎test/parallel/test-tls-psk-circuit.js‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,12 @@ test({ psk: USERS.UserA, identity: 'UserA' }, { minVersion: 'TLSv1.3' });
7070
test({ psk: USERS.UserB, identity: 'UserB' });
7171
test({ psk: USERS.UserB, identity: 'UserB' }, { minVersion: 'TLSv1.3' });
7272
// Unrecognized user should fail handshake
73-
const expectedHandshakeErr = hasOpenSSL(4, 0) ?
74-
'ERR_SSL_TLS_ALERT_HANDSHAKE_FAILURE' : hasOpenSSL(3, 2) ?
75-
'ERR_SSL_SSL/TLS_ALERT_HANDSHAKE_FAILURE' : 'ERR_SSL_SSLV3_ALERT_HANDSHAKE_FAILURE';
73+
// OpenSSL 4.1 uses the same alert as for an invalid binder when no certificate
74+
// is available: https://github.com/openssl/openssl/pull/31026
75+
const expectedHandshakeErr = hasOpenSSL(4, 1) ?
76+
'ERR_SSL_TLSV1_ALERT_DECRYPT_ERROR' : hasOpenSSL(4, 0) ?
77+
'ERR_SSL_TLS_ALERT_HANDSHAKE_FAILURE' : hasOpenSSL(3, 2) ?
78+
'ERR_SSL_SSL/TLS_ALERT_HANDSHAKE_FAILURE' : 'ERR_SSL_SSLV3_ALERT_HANDSHAKE_FAILURE';
7679
test({ psk: USERS.UserB, identity: 'UserC' }, {}, expectedHandshakeErr);
7780
// Recognized user but incorrect secret should fail handshake
7881
const expectedIllegalParameterErr = hasOpenSSL(3, 4) ? 'ERR_SSL_TLSV1_ALERT_DECRYPT_ERROR' :

0 commit comments

Comments
 (0)