Skip to content

test: merge test-crypto-dh-hash with modp18 test #43891

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nodejs-github-bot merged 1 commit into from
Jul 22, 2022
Merged

test: merge test-crypto-dh-hash with modp18 test #43891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
  • Loading branch information
@tniessen
tniessen committed Jul 18, 2022
commit 2b31af845e75adba576ea6bb9377124174f5ef70
48 changes: 0 additions & 48 deletions test/pummel/test-crypto-dh-hash-modp18.js
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions test/pummel/test-crypto-dh-hash.js
View file
Open in desktop
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