summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Majer <amajer@suse.de>2018-10-25 13:19:27 +0200
committerMichaël Zasso <targos@protonmail.com>2018-10-28 15:12:28 +0100
commit0a23538e49e27b95ee35b051b6507eca74e2bb20 (patch)
tree13c4e7d22269b5958f7a4be3cdbb4f87d7e125c6
parent6b170f7c157f7e7f8a7933c5bae712d2e382010b (diff)
downloadandroid-node-v8-0a23538e49e27b95ee35b051b6507eca74e2bb20.tar.gz
android-node-v8-0a23538e49e27b95ee35b051b6507eca74e2bb20.tar.bz2
android-node-v8-0a23538e49e27b95ee35b051b6507eca74e2bb20.zip
test: fix regression when compiled with FIPS
In commit bff53c5a9d6, a check was added for very specific OpenSSL format. Unfortunately, when OpenSSL is compiled in FIPS mode, this check fails. Added additional regex to satisfy OpenSSL version strings in both regular and FIPS modes. PR-URL: https://github.com/nodejs/node/pull/23871 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Sam Roberts <vieuxtech@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
-rw-r--r--test/parallel/test-process-versions.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/parallel/test-process-versions.js b/test/parallel/test-process-versions.js
index 9a21128677..e8527fe574 100644
--- a/test/parallel/test-process-versions.js
+++ b/test/parallel/test-process-versions.js
@@ -34,7 +34,7 @@ assert(/^\d+\.\d+\.\d+(?:\.\d+)?-node\.\d+(?: \(candidate\))?$/
assert(/^\d+$/.test(process.versions.modules));
if (common.hasCrypto) {
- assert(/^\d+\.\d+\.\d+[a-z]?$/.test(process.versions.openssl));
+ assert(/^\d+\.\d+\.\d+[a-z]?(-fips)?$/.test(process.versions.openssl));
}
for (let i = 0; i < expected_keys.length; i++) {