Skip to content

Commit 89fdfde

Browse files
codebyteretargos
authored andcommitted
test: make crypto tests work with BoringSSL
PR-URL: #58117 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Michael Dawson <midawson@redhat.com>
1 parent 9fccb06 commit 89fdfde

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

test/parallel/test-crypto-stream.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,14 @@ const decipher = crypto.createDecipheriv('aes-128-cbc', badkey, iv);
7474

7575
cipher.pipe(decipher)
7676
.on('error', common.expectsError(hasOpenSSL3 ? {
77-
message: /bad decrypt/,
77+
message: /bad[\s_]decrypt/,
7878
library: 'Provider routines',
79-
reason: 'bad decrypt',
79+
reason: /bad[\s_]decrypt/i,
8080
} : {
81-
message: /bad decrypt/,
81+
message: /bad[\s_]decrypt/i,
8282
function: 'EVP_DecryptFinal_ex',
8383
library: 'digital envelope routines',
84-
reason: 'bad decrypt',
84+
reason: /bad[\s_]decrypt/i,
8585
}));
8686

8787
cipher.end('Papaya!'); // Should not cause an unhandled exception.

test/parallel/test-crypto.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,9 +218,9 @@ assert.throws(() => {
218218
} : {
219219
name: 'Error',
220220
message: /routines:RSA_sign:digest too big for rsa key$/,
221-
library: 'rsa routines',
221+
library: /rsa routines/i,
222222
function: 'RSA_sign',
223-
reason: 'digest too big for rsa key',
223+
reason: /digest[\s_]too[\s_]big[\s_]for[\s_]rsa[\s_]key/i,
224224
code: 'ERR_OSSL_RSA_DIGEST_TOO_BIG_FOR_RSA_KEY'
225225
});
226226
return true;

test/parallel/test-tls-alert-handling.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,16 @@ let iter = 0;
3535

3636
const errorHandler = common.mustCall((err) => {
3737
let expectedErrorCode = 'ERR_SSL_WRONG_VERSION_NUMBER';
38-
let expectedErrorReason = 'wrong version number';
38+
let expectedErrorReason = /wrong[\s_]version[\s_]number/i;
3939
if (hasOpenSSL(3, 2)) {
4040
expectedErrorCode = 'ERR_SSL_PACKET_LENGTH_TOO_LONG';
41-
expectedErrorReason = 'packet length too long';
41+
expectedErrorReason = /packet[\s_]length[\s_]too[\s_]long/i;
4242
};
4343

4444
assert.strictEqual(err.code, expectedErrorCode);
4545
assert.strictEqual(err.library, 'SSL routines');
4646
if (!hasOpenSSL3) assert.strictEqual(err.function, 'ssl3_get_record');
47-
assert.strictEqual(err.reason, expectedErrorReason);
47+
assert.match(err.reason, expectedErrorReason);
4848
errorReceived = true;
4949
if (canCloseServer())
5050
server.close();
@@ -98,15 +98,15 @@ function sendBADTLSRecord() {
9898
}));
9999
client.on('error', common.mustCall((err) => {
100100
let expectedErrorCode = 'ERR_SSL_TLSV1_ALERT_PROTOCOL_VERSION';
101-
let expectedErrorReason = 'tlsv1 alert protocol version';
101+
let expectedErrorReason = /tlsv1[\s_]alert[\s_]protocol[\s_]version/i;
102102
if (hasOpenSSL(3, 2)) {
103103
expectedErrorCode = 'ERR_SSL_TLSV1_ALERT_RECORD_OVERFLOW';
104-
expectedErrorReason = 'tlsv1 alert record overflow';
104+
expectedErrorReason = /tlsv1[\s_]alert[\s_]record[\s_]overflow/i;
105105
}
106106
assert.strictEqual(err.code, expectedErrorCode);
107107
assert.strictEqual(err.library, 'SSL routines');
108108
if (!hasOpenSSL3)
109109
assert.strictEqual(err.function, 'ssl3_read_bytes');
110-
assert.strictEqual(err.reason, expectedErrorReason);
110+
assert.match(err.reason, expectedErrorReason);
111111
}));
112112
}

0 commit comments

Comments
 (0)