test: fix regression when compiled with FIPS

AdamMajer · targos · commit f7f1e6bcf3d9 · 2018-10-28T15:23:59.000+01:00
In commit bff53c5, 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: #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>
diff --git 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++) {

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ assert(/^\d+\.\d+\.\d+(?:\.\d+)?-node\.\d+(?: \(candidate\))?$/`
`34`	`34`	`assert(/^\d+$/.test(process.versions.modules));`
`35`	`35`
`36`	`36`	`if (common.hasCrypto) {`
`37`		`- assert(/^\d+\.\d+\.\d+[a-z]?$/.test(process.versions.openssl));`
	`37`	`+ assert(/^\d+\.\d+\.\d+[a-z]?(-fips)?$/.test(process.versions.openssl));`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`for (let i = 0; i < expected_keys.length; i++) {`