summaryrefslogtreecommitdiff
path: root/jstests
diff options
context:
space:
mode:
authorSpencer Jackson <spencer.jackson@mongodb.com>2016-10-06 16:09:24 -0400
committerSpencer Jackson <spencer.jackson@mongodb.com>2016-10-07 11:25:56 -0400
commit0508bae1af9d95a36a12ec20c23f2adbafe4b738 (patch)
tree3949ea4568cd8a55d763dbd72fdd3159e8a75372 /jstests
parent7ed6d27ab216c0a651b994fec305ea1b1128cc9f (diff)
downloadmongo-0508bae1af9d95a36a12ec20c23f2adbafe4b738.tar.gz
SERVER-24350: Reenable strict OpenSSL FIPS error detection on Ubuntu 16.04
Diffstat (limited to 'jstests')
-rw-r--r--jstests/ssl/ssl_fips.js5
1 files changed, 1 insertions, 4 deletions
diff --git a/jstests/ssl/ssl_fips.js b/jstests/ssl/ssl_fips.js
index 47f148340d9..9b3e4b94c96 100644
--- a/jstests/ssl/ssl_fips.js
+++ b/jstests/ssl/ssl_fips.js
@@ -24,10 +24,7 @@ if (mongo != 0) {
print("mongod failed to start, checking for FIPS support");
mongoOutput = rawMongoProgramOutput();
assert(mongoOutput.match(/this version of mongodb was not compiled with FIPS support/) ||
- mongoOutput.match(/FIPS_mode_set:fips mode not supported/) ||
- // Ubuntu 16.04's OpenSSL produces an unexpected error message, remove this check when
- // SERVER-24350 is resolved
- mongoOutput.match(/error:00000000:lib\(0\):func\(0\):reason\(0\)/));
+ mongoOutput.match(/FIPS_mode_set:fips mode not supported/));
} else {
// verify that auth works, SERVER-18051
md.getDB("admin").createUser({user: "root", pwd: "root", roles: ["root"]});