Skip to content

Commit

Permalink
Revert "test: skip different params test for OpenSSL 3.x"
Browse files Browse the repository at this point in the history
This reverts commit 269f513.

Fixes: #38216

PR-URL: #40640
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Michael Dawson <midawson@redhat.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
  • Loading branch information
danbev authored and danielleadams committed Feb 1, 2022
1 parent 3055ede commit 38fd30f
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions test/parallel/test-crypto-dh-stateless.js
Original file line number Diff line number Diff line change
Expand Up @@ -144,17 +144,13 @@ test(crypto.generateKeyPairSync('dh', { group: 'modp5' }),
test(crypto.generateKeyPairSync('dh', { group: 'modp5' }),
crypto.generateKeyPairSync('dh', { prime: group.getPrime() }));

const list = [];
// Same generator, but different primes.
// TODO(danbev) only commenting out this so that we can get our CI build
// to pass. I'll continue looking into the cause/change.
// [{ group: 'modp5' }, { group: 'modp18' }]];
const list = [
// Same generator, but different primes.
[{ group: 'modp5' }, { group: 'modp18' }]];

// TODO(danbev): Take a closer look if there should be a check in OpenSSL3
// when the dh parameters differ.
if (!common.hasOpenSSL3) {
// Same generator, but different primes.
list.push([{ group: 'modp5' }, { group: 'modp18' }]);
// Same primes, but different generator.
list.push([{ group: 'modp5' }, { prime: group.getPrime(), generator: 5 }]);
// Same generator, but different primes.
Expand All @@ -167,7 +163,7 @@ for (const [params1, params2] of list) {
crypto.generateKeyPairSync('dh', params2));
}, common.hasOpenSSL3 ? {
name: 'Error',
code: 'ERR_OSSL_DH_INVALID_PUBLIC_KEY'
code: 'ERR_OSSL_MISMATCHING_DOMAIN_PARAMETERS'
} : {
name: 'Error',
code: 'ERR_OSSL_EVP_DIFFERENT_PARAMETERS'
Expand Down

0 comments on commit 38fd30f

Please sign in to comment.