nodejs
diff --git a/Collapse file
‎test/common/index.js‎
Copy file name to clipboardExpand all lines: test/common/index.js
+30-10Lines changed: 30 additions & 10 deletions b/Collapse file
‎test/common/index.js‎
Copy file name to clipboardExpand all lines: test/common/index.js
+30-10Lines changed: 30 additions & 10 deletions
diff --git a/Collapse file
‎test/parallel/test-crypto-dh.js‎
Copy file name to clipboardExpand all lines: test/parallel/test-crypto-dh.js
+2-2Lines changed: 2 additions & 2 deletions b/Collapse file
‎test/parallel/test-crypto-dh.js‎
Copy file name to clipboardExpand all lines: test/parallel/test-crypto-dh.js
+2-2Lines changed: 2 additions & 2 deletions
@@ -55,14 +55,24 @@ const noop = () => {};
 const hasCrypto = Boolean(process.versions.openssl) &&
                   !process.env.NODE_SKIP_CRYPTO;
 
-const hasOpenSSL3 = hasCrypto &&
-    require('crypto').constants.OPENSSL_VERSION_NUMBER >= 0x30000000;
-
-const hasOpenSSL31 = hasCrypto &&
-    require('crypto').constants.OPENSSL_VERSION_NUMBER >= 0x30100000;
+// Synthesize OPENSSL_VERSION_NUMBER format with the layout 0xMNN00PPSL
+const opensslVersionNumber = (major = 0, minor = 0, patch = 0) => {
+  assert(major >= 0 && major <= 0xf);
+  assert(minor >= 0 && minor <= 0xff);
+  assert(patch >= 0 && patch <= 0xff);
+  return (major << 28) | (minor << 20) | (patch << 4);
+};
 
-const hasOpenSSL32 = hasCrypto &&
-    require('crypto').constants.OPENSSL_VERSION_NUMBER >= 0x30200000;
+let OPENSSL_VERSION_NUMBER;
+const hasOpenSSL = (major = 0, minor = 0, patch = 0) => {
+  if (!hasCrypto) return false;
+  if (OPENSSL_VERSION_NUMBER === undefined) {
+    const regexp = /(?<m>\d+)\.(?<n>\d+)\.(?<p>\d+)/;
+    const { m, n, p } = process.versions.openssl.match(regexp).groups;
+    OPENSSL_VERSION_NUMBER = opensslVersionNumber(m, n, p);
+  }
+  return OPENSSL_VERSION_NUMBER >= opensslVersionNumber(major, minor, patch);
+};
 
 const hasQuic = hasCrypto && !!process.config.variables.openssl_quic;
 
@@ -903,9 +913,7 @@ const common = {
   getTTYfd,
   hasIntl,
   hasCrypto,
-  hasOpenSSL3,
-  hasOpenSSL31,
-  hasOpenSSL32,
+  hasOpenSSL,
   hasQuic,
   hasMultiLocalhost,
   invalidArgTypeHelper,
@@ -966,6 +974,18 @@ const common = {
     });
   },
 
+  get hasOpenSSL3() {
+    return hasOpenSSL(3);
+  },
+
+  get hasOpenSSL31() {
+    return hasOpenSSL(3, 1);
+  },
+
+  get hasOpenSSL32() {
+    return hasOpenSSL(3, 2);
+  },
+
   get inFreeBSDJail() {
     if (inFreeBSDJail !== null) return inFreeBSDJail;
 
 
@@ -86,8 +86,8 @@ const crypto = require('crypto');
   }
 
   {
-    const v = crypto.constants.OPENSSL_VERSION_NUMBER;
-    const hasOpenSSL3WithNewErrorMessage = (v >= 0x300000c0 && v <= 0x30100000) || (v >= 0x30100040 && v <= 0x30200000);
+    const hasOpenSSL3WithNewErrorMessage = (common.hasOpenSSL(3, 0, 12) && !common.hasOpenSSL(3, 1, 1)) ||
+                                           (common.hasOpenSSL(3, 1, 4) && !common.hasOpenSSL(3, 2, 1));
     assert.throws(() => {
       dh3.computeSecret('');
     }, { message: common.hasOpenSSL3 && !hasOpenSSL3WithNewErrorMessage ?
Original file line number	Diff line number	Diff line change
`@@ -86,8 +86,8 @@ const crypto = require('crypto');`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`{`
`89`		`- const v = crypto.constants.OPENSSL_VERSION_NUMBER;`
`90`		`- const hasOpenSSL3WithNewErrorMessage = (v >= 0x300000c0 && v <= 0x30100000) \|\| (v >= 0x30100040 && v <= 0x30200000);`
	`89`	`+ const hasOpenSSL3WithNewErrorMessage = (common.hasOpenSSL(3, 0, 12) && !common.hasOpenSSL(3, 1, 1)) \|\|`
	`90`	`+ (common.hasOpenSSL(3, 1, 4) && !common.hasOpenSSL(3, 2, 1));`
`91`	`91`	`assert.throws(() => {`
`92`	`92`	`dh3.computeSecret('');`
`93`	`93`	`}, { message: common.hasOpenSSL3 && !hasOpenSSL3WithNewErrorMessage ?`