summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSpencer Jackson <spencer.jackson@mongodb.com>2016-06-01 15:49:10 -0400
committerSpencer Jackson <spencer.jackson@mongodb.com>2016-06-02 12:55:03 -0400
commit4c79077a39e036a6ddac5fadfbe1513348a04e35 (patch)
treee0c51d77a6df8407d0de6968ca61abbf778a9fab
parent18fe193474d30988f7bd0f85d3f2a86d662e46d9 (diff)
downloadmongo-4c79077a39e036a6ddac5fadfbe1513348a04e35.tar.gz
SERVER-24369: Accept OpenSSL FIPS error message from Ubuntu 16.04
-rw-r--r--jstests/ssl/ssl_fips.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/jstests/ssl/ssl_fips.js b/jstests/ssl/ssl_fips.js
index 9b3e4b94c96..47f148340d9 100644
--- a/jstests/ssl/ssl_fips.js
+++ b/jstests/ssl/ssl_fips.js
@@ -24,7 +24,10 @@ 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/));
+ 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\)/));
} else {
// verify that auth works, SERVER-18051
md.getDB("admin").createUser({user: "root", pwd: "root", roles: ["root"]});