From 2b31af845e75adba576ea6bb9377124174f5ef70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Nie=C3=9Fen?= <tniessen@tnie.de>
Date: Mon, 18 Jul 2022 12:55:41 +0000
Subject: [PATCH] test: merge test-crypto-dh-hash with modp18 test

This test file was split because it was taking a long time in some
versions of OpenSSL 1.1.1, but that is not the case anymore with
OpenSSL 3.0, so merge the tests again.

Refs: https://github.com/nodejs/node/pull/34631
---
 test/pummel/test-crypto-dh-hash-modp18.js | 48 -----------------------
 test/pummel/test-crypto-dh-hash.js        |  5 +++
 2 files changed, 5 insertions(+), 48 deletions(-)
 delete mode 100644 test/pummel/test-crypto-dh-hash-modp18.js

diff --git a/test/pummel/test-crypto-dh-hash-modp18.js b/test/pummel/test-crypto-dh-hash-modp18.js
deleted file mode 100644
index ceb4cbd885c464..00000000000000
--- a/test/pummel/test-crypto-dh-hash-modp18.js
+++ /dev/null
@@ -1,48 +0,0 @@
-// 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.');
-}
-
-if (common.isPi) {
-  common.skip('Too slow for Raspberry Pi devices');
-}
-
-const assert = require('assert');
-const crypto = require('crypto');
-
-const hashes = {
-  modp18: 'a870b491bbbec9b131ae9878d07449d32e54f160'
-};
-
-for (const name in hashes) {
-  const group = crypto.getDiffieHellman(name);
-  const private_key = group.getPrime('hex');
-  const hash1 = hashes[name];
-  const hash2 = crypto.createHash('sha1')
-                    .update(private_key.toUpperCase()).digest('hex');
-  assert.strictEqual(hash1, hash2);
-  assert.strictEqual(group.getGenerator('hex'), '02');
-}
diff --git a/test/pummel/test-crypto-dh-hash.js b/test/pummel/test-crypto-dh-hash.js
index 3ad974ff329efd..4e71eb961cf6da 100644
--- a/test/pummel/test-crypto-dh-hash.js
+++ b/test/pummel/test-crypto-dh-hash.js
@@ -30,6 +30,10 @@ if (common.isPi) {
   common.skip('Too slow for Raspberry Pi devices');
 }
 
+if (!common.hasOpenSSL3) {
+  common.skip('Too slow when dynamically linked against OpenSSL 1.1.1');
+}
+
 const assert = require('assert');
 const crypto = require('crypto');
 
@@ -41,6 +45,7 @@ const hashes = {
   modp15: '7bdd39e5cdbb9748113933e5c2623b559c534e74',
   modp16: 'daea5277a7ad0116e734a8e0d2f297ef759d1161',
   modp17: '3b62aaf0142c2720f0bf26a9589b0432c00eadc1',
+  modp18: 'a870b491bbbec9b131ae9878d07449d32e54f160',
 };
 
 for (const name in hashes) {