Fix various crypto Diffie-Hellmann issues in pummel tests

test/parallel/test-crypto-dh.js

@@ -388,3 +388,30 @@ common.expectsError(
  message: 'The "curve" argument must be of type string. ' +
  'Received type undefined'
  });
+
+assert.throws(
+ function() {
+ crypto.getDiffieHellman('unknown-group');
+ },
+ /^Error: Unknown group$/,
+ 'crypto.getDiffieHellman(\'unknown-group\') ' +
+ 'failed to throw the expected error.'
+);
+assert.throws(
+ function() {
+ crypto.getDiffieHellman('modp1').setPrivateKey('');
+ },
+ new RegExp('^TypeError: crypto\\.getDiffieHellman\\(\\.\\.\\.\\)\\.' +
+ 'setPrivateKey is not a function$'),
+ 'crypto.getDiffieHellman(\'modp1\').setPrivateKey(\'\') ' +
+ 'failed to throw the expected error.'
+);
+assert.throws(
+ function() {
+ crypto.getDiffieHellman('modp1').setPublicKey('');
+ },
+ new RegExp('^TypeError: crypto\\.getDiffieHellman\\(\\.\\.\\.\\)\\.' +
+ 'setPublicKey is not a function$'),
+ 'crypto.getDiffieHellman(\'modp1\').setPublicKey(\'\') ' +
+ 'failed to throw the expected error.'
+);

test/pummel/test-crypto-dh.js → test/pummel/test-crypto-dh-hash.js

@@ -27,33 +27,6 @@ if (!common.hasCrypto)
 const assert = require('assert');
 const crypto = require('crypto');
 
-assert.throws(
- function() {
- crypto.getDiffieHellman('unknown-group');
- },
- /^Error: Unknown group$/,
- 'crypto.getDiffieHellman(\'unknown-group\') ' +
- 'failed to throw the expected error.'
-);
-assert.throws(
- function() {
- crypto.getDiffieHellman('modp1').setPrivateKey('');
- },
- new RegExp('^TypeError: crypto\\.getDiffieHellman\\(\\.\\.\\.\\)\\.' +
- 'setPrivateKey is not a function$'),
- 'crypto.getDiffieHellman(\'modp1\').setPrivateKey(\'\') ' +
- 'failed to throw the expected error.'
-);
-assert.throws(
- function() {
- crypto.getDiffieHellman('modp1').setPublicKey('');
- },
- new RegExp('^TypeError: crypto\\.getDiffieHellman\\(\\.\\.\\.\\)\\.' +
- 'setPublicKey is not a function$'),
- 'crypto.getDiffieHellman(\'modp1\').setPublicKey(\'\') ' +
- 'failed to throw the expected error.'
-);
-
 const hashes = {
  modp1: '630e9acd2cc63f7e80d8507624ba60ac0757201a',
  modp2: '18f7aa964484137f57bca64b21917a385b6a0b60',
@@ -74,16 +47,3 @@ for (const name in hashes) {
  assert.strictEqual(hash1, hash2);
  assert.strictEqual(group.getGenerator('hex'), '02');
 }
-
-for (const name in hashes) {
- // modp1 is 768 bits, FIPS requires >= 1024
- if (name === 'modp1' && common.hasFipsCrypto)
- continue;
- const group1 = crypto.getDiffieHellman(name);
- const group2 = crypto.getDiffieHellman(name);
- group1.generateKeys();
- group2.generateKeys();
- const key1 = group1.computeSecret(group2.getPublicKey());
- const key2 = group2.computeSecret(group1.getPublicKey());
- assert.deepStrictEqual(key1, key2);
-}

test/pummel/test-crypto-dh-keys.js

@@ -0,0 +1,42 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+'use strict';
+const common = require('../common');
+if (!common.hasCrypto)
+ common.skip('node compiled without OpenSSL.');
+
+const assert = require('assert');
+const crypto = require('crypto');
+
+[ 'modp1', 'modp2', 'modp5', 'modp14', 'modp15', 'modp16', 'modp17' ]
+.forEach((name) => {
+ // modp1 is 768 bits, FIPS requires >= 1024
+ if (name === 'modp1' && common.hasFipsCrypto)
+ return;
+ const group1 = crypto.getDiffieHellman(name);
+ const group2 = crypto.getDiffieHellman(name);
+ group1.generateKeys();
+ group2.generateKeys();
+ const key1 = group1.computeSecret(group2.getPublicKey());
+ const key2 = group2.computeSecret(group1.getPublicKey());
+ assert.deepStrictEqual(key1, key2);
+});

test/pummel/test-dh-regr.js

@@ -27,7 +27,11 @@ if (!common.hasCrypto)
 const assert = require('assert');
 const crypto = require('crypto');
 
-const p = crypto.createDiffieHellman(1024).getPrime();
+// FIPS requires length >= 1024 but we use 256 in this test to keep it from
+// taking too long and timing out in CI.
+const length = common.hasFipsCrypto ? 1024 : 256;
+
+const p = crypto.createDiffieHellman(length).getPrime();
 
 for (let i = 0; i < 2000; i++) {
  const a = crypto.createDiffieHellman(p);