Skip to content

Commit

Permalink
test: merge test-crypto-dh-hash with modp18 test
Browse files Browse the repository at this point in the history
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
  • Loading branch information
tniessen committed Jul 18, 2022
1 parent b4c2c56 commit 2b31af8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 48 deletions.
48 changes: 0 additions & 48 deletions test/pummel/test-crypto-dh-hash-modp18.js

This file was deleted.

5 changes: 5 additions & 0 deletions test/pummel/test-crypto-dh-hash.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ if (common.isPi) {
common.skip('Too slow for Raspberry Pi devices');
}

if (!common.hasOpenSSL3) {
common.skip('Too slow when dynamically linked against OpenSSL 1.1.1');
}

const assert = require('assert');
const crypto = require('crypto');

Expand All @@ -41,6 +45,7 @@ const hashes = {
modp15: '7bdd39e5cdbb9748113933e5c2623b559c534e74',
modp16: 'daea5277a7ad0116e734a8e0d2f297ef759d1161',
modp17: '3b62aaf0142c2720f0bf26a9589b0432c00eadc1',
modp18: 'a870b491bbbec9b131ae9878d07449d32e54f160',
};

for (const name in hashes) {
Expand Down

0 comments on commit 2b31af8

Please sign in to comment.