Skip to content

Commit d9f4a3e

Browse files
panvaaduh95
panva
authored and
aduh95
committed
test: reuse fixed primes in DH tests
Use the modp14 prime instead of generating fresh parameters for tests of constructors, key setters, and memory retention. Keep generic DiffieHellman instances and the existing setter and leak assertions. Signed-off-by: Filip Skokan <[email protected]> Assisted-by: Codex PR-URL: #65980 Backport-PR-URL: #66233 Reviewed-By: Antoine du Hamel <[email protected]>
1 parent a0fd0a8 commit d9f4a3e

3 files changed

Lines changed: 7 additions & 14 deletions

File tree

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,14 @@ if (!common.hasCrypto)
55

66
const assert = require('assert');
77
const crypto = require('crypto');
8-
const { hasOpenSSL, hasFIPS } = require('../common/crypto');
8+
const { hasFIPS } = require('../common/crypto');
99

10-
const size = hasFIPS(3) ?
11-
2048 : (crypto.getFips() === 1 || hasOpenSSL(3) ? 1024 : 256);
12-
const dh1 = crypto.createDiffieHellman(size);
13-
const p1 = dh1.getPrime('buffer');
10+
const prime = crypto.getDiffieHellman('modp14').getPrime('buffer');
1411

1512
{
1613
const DiffieHellman = crypto.DiffieHellman;
1714

18-
const dh = DiffieHellman(p1, 'buffer');
15+
const dh = DiffieHellman(prime, 'buffer');
1916
assert(dh instanceof DiffieHellman, 'DiffieHellman is expected to return a ' +
2017
'new instance when called without `new`');
2118
}

‎test/parallel/test-crypto-dh-generate-keys.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@ if (!common.hasCrypto)
66

77
const assert = require('assert');
88
const crypto = require('crypto');
9-
const { hasOpenSSL, hasFIPS } = require('../common/crypto');
109

1110
{
12-
const size = hasFIPS(3) ?
13-
2048 : (crypto.getFips() === 1 || hasOpenSSL(3) ? 1024 : 256);
11+
const prime = crypto.getDiffieHellman('modp14').getPrime();
1412

1513
function unlessInvalidState(f) {
1614
try {
@@ -23,7 +21,7 @@ const { hasOpenSSL, hasFIPS } = require('../common/crypto');
2321
}
2422

2523
function testGenerateKeysChangesKeys(setup, expected) {
26-
const dh = crypto.createDiffieHellman(size);
24+
const dh = crypto.createDiffieHellman(prime);
2725
setup(dh);
2826
const firstPublicKey = unlessInvalidState(() => dh.getPublicKey());
2927
const firstPrivateKey = unlessInvalidState(() => dh.getPrivateKey());

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,11 @@ if (common.isASan)
99

1010
const assert = require('assert');
1111
const crypto = require('crypto');
12-
const { hasOpenSSL, hasFIPS } = require('../common/crypto');
1312

1413
const before = process.memoryUsage.rss();
1514
{
16-
const size = hasFIPS(3) ?
17-
2048 : (crypto.getFips() === 1 || hasOpenSSL(3) ? 1024 : 256);
18-
const dh = crypto.createDiffieHellman(size);
15+
const prime = crypto.getDiffieHellman('modp14').getPrime();
16+
const dh = crypto.createDiffieHellman(prime);
1917
const publicKey = dh.generateKeys();
2018
const privateKey = dh.getPrivateKey();
2119
for (let i = 0; i < 5e4; i += 1) {

0 commit comments

Comments
 (0)