Commit 9f508e3
test: split pummel crypto dh test into two separate tests
Split test-crypto-dh into two tests so that it does not time out in CI.
With a recent OpenSSL upgrade, getDiffieHellman() is much slower than
before.
PR-URL: #28390
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>1 parent e161744 commit 9f508e3
2 files changed
Lines changed: 42 additions & 13 deletions
Lines changed: 0 additions & 13 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -47,16 +47,3 @@ for (const name in hashes) { | |||
| 47 | 47 | assert.strictEqual(hash1, hash2); | |
| 48 | 48 | assert.strictEqual(group.getGenerator('hex'), '02'); | |
| 49 | 49 | } | |
| 50 | - | ||
| 51 | - for (const name in hashes) { | ||
| 52 | - // modp1 is 768 bits, FIPS requires >= 1024 | ||
| 53 | - if (name === 'modp1' && common.hasFipsCrypto) | ||
| 54 | - continue; | ||
| 55 | - const group1 = crypto.getDiffieHellman(name); | ||
| 56 | - const group2 = crypto.getDiffieHellman(name); | ||
| 57 | - group1.generateKeys(); | ||
| 58 | - group2.generateKeys(); | ||
| 59 | - const key1 = group1.computeSecret(group2.getPublicKey()); | ||
| 60 | - const key2 = group2.computeSecret(group1.getPublicKey()); | ||
| 61 | - assert.deepStrictEqual(key1, key2); | ||
| 62 | - } | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -0,0 +1,42 @@ | |||
| 1 | + // Copyright Joyent, Inc. and other Node contributors. | ||
| 2 | + // | ||
| 3 | + // Permission is hereby granted, free of charge, to any person obtaining a | ||
| 4 | + // copy of this software and associated documentation files (the | ||
| 5 | + // "Software"), to deal in the Software without restriction, including | ||
| 6 | + // without limitation the rights to use, copy, modify, merge, publish, | ||
| 7 | + // distribute, sublicense, and/or sell copies of the Software, and to permit | ||
| 8 | + // persons to whom the Software is furnished to do so, subject to the | ||
| 9 | + // following conditions: | ||
| 10 | + // | ||
| 11 | + // The above copyright notice and this permission notice shall be included | ||
| 12 | + // in all copies or substantial portions of the Software. | ||
| 13 | + // | ||
| 14 | + // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS | ||
| 15 | + // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
| 16 | + // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN | ||
| 17 | + // NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, | ||
| 18 | + // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR | ||
| 19 | + // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE | ||
| 20 | + // USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 21 | + | ||
| 22 | + 'use strict'; | ||
| 23 | + const common = require('../common'); | ||
| 24 | + if (!common.hasCrypto) | ||
| 25 | + common.skip('node compiled without OpenSSL.'); | ||
| 26 | + | ||
| 27 | + const assert = require('assert'); | ||
| 28 | + const crypto = require('crypto'); | ||
| 29 | + | ||
| 30 | + [ 'modp1', 'modp2', 'modp5', 'modp14', 'modp15', 'modp16', 'modp17' ] | ||
| 31 | + .forEach((name) => { | ||
| 32 | + // modp1 is 768 bits, FIPS requires >= 1024 | ||
| 33 | + if (name === 'modp1' && common.hasFipsCrypto) | ||
| 34 | + return; | ||
| 35 | + const group1 = crypto.getDiffieHellman(name); | ||
| 36 | + const group2 = crypto.getDiffieHellman(name); | ||
| 37 | + group1.generateKeys(); | ||
| 38 | + group2.generateKeys(); | ||
| 39 | + const key1 = group1.computeSecret(group2.getPublicKey()); | ||
| 40 | + const key2 = group2.computeSecret(group1.getPublicKey()); | ||
| 41 | + assert.deepStrictEqual(key1, key2); | ||
| 42 | + }); | ||
0 commit comments