Skip to content

Commit ef21ad2

Browse files
tniessendanielleadams
authored andcommitted
test: merge test-crypto-dh-hash with modp18 test
This test file was split because it was taking a long time in some versions of OpenSSL 1.1.1, but that is not the case anymore with OpenSSL 3.0, so merge the tests again. Refs: #34631 PR-URL: #43891 Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Rich Trott <[email protected]>
1 parent 8b83b4d commit ef21ad2

File tree

2 files changed

+5
-48
lines changed

2 files changed

+5
-48
lines changed

test/pummel/test-crypto-dh-hash-modp18.js

-48
This file was deleted.

test/pummel/test-crypto-dh-hash.js

+5
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ if (common.isPi) {
3030
common.skip('Too slow for Raspberry Pi devices');
3131
}
3232

33+
if (!common.hasOpenSSL3) {
34+
common.skip('Too slow when dynamically linked against OpenSSL 1.1.1');
35+
}
36+
3337
const assert = require('assert');
3438
const crypto = require('crypto');
3539

@@ -41,6 +45,7 @@ const hashes = {
4145
modp15: '7bdd39e5cdbb9748113933e5c2623b559c534e74',
4246
modp16: 'daea5277a7ad0116e734a8e0d2f297ef759d1161',
4347
modp17: '3b62aaf0142c2720f0bf26a9589b0432c00eadc1',
48+
modp18: 'a870b491bbbec9b131ae9878d07449d32e54f160',
4449
};
4550

4651
for (const name in hashes) {

0 commit comments

Comments
 (0)