Revert "test: skip different params test for OpenSSL 3.x" · nodejs/node@943547a · GitHub

nodejs / node Public

• Notifications You must be signed in to change notification settings
• Fork 36.6k
• Star 120k

• Code
• Issues 638
• Pull requests 751
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 943547a

Browse filesBrowse the repository at this point in the historyBrowse files

danbev

authored and

danielleadams

committed

Revert "test: skip different params test for OpenSSL 3.x"

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>

1 parent a2fb12f commit 943547a
Copy full SHA for 943547a

1 file changed

+4-8Lines changed: 4 additions & 8 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• test/parallel
  • test-crypto-dh-stateless.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎test/parallel/test-crypto-dh-stateless.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-crypto-dh-stateless.js

+4-8Lines changed: 4 additions & 8 deletions

Original file line number	Diff line number	Diff line change
@@ -144,17 +144,13 @@ test(crypto.generateKeyPairSync('dh', { group: 'modp5' }),
144	144	test(crypto.generateKeyPairSync('dh', { group: 'modp5' }),
145	145	crypto.generateKeyPairSync('dh', { prime: group.getPrime() }));
146	146
147		- const list = [];
148		- // Same generator, but different primes.
149		- // TODO(danbev) only commenting out this so that we can get our CI build
150		- // to pass. I'll continue looking into the cause/change.
151		- // [{ group: 'modp5' }, { group: 'modp18' }]];
	147	+ const list = [
	148	+ // Same generator, but different primes.
	149	+ [{ group: 'modp5' }, { group: 'modp18' }]];
152	150
153	151	// TODO(danbev): Take a closer look if there should be a check in OpenSSL3
154	152	// when the dh parameters differ.
155	153	if (!common.hasOpenSSL3) {
156		- // Same generator, but different primes.
157		- list.push([{ group: 'modp5' }, { group: 'modp18' }]);
158	154	// Same primes, but different generator.
159	155	list.push([{ group: 'modp5' }, { prime: group.getPrime(), generator: 5 }]);
160	156	// Same generator, but different primes.
@@ -167,7 +163,7 @@ for (const [params1, params2] of list) {
167	163	crypto.generateKeyPairSync('dh', params2));
168	164	}, common.hasOpenSSL3 ? {
169	165	name: 'Error',
170		- code: 'ERR_OSSL_DH_INVALID_PUBLIC_KEY'
	166	+ code: 'ERR_OSSL_MISMATCHING_DOMAIN_PARAMETERS'
171	167	} : {
172	168	name: 'Error',
173	169	code: 'ERR_OSSL_EVP_DIFFERENT_PARAMETERS'

0 commit comments

Comments

0 (0)