1 files changed, 0 insertions, 32 deletions
diff --git a/src/mongo/shell/servers.js b/src/mongo/shell/servers.js
index 52defda408c..6c487edb20e 100755
--- a/src/mongo/shell/servers.js
+++ b/src/mongo/shell/servers.js
@@ -423,23 +423,7 @@ MongoRunner.mongoOptions = function( opts ){
     // Default for waitForConnect is true
     opts.waitForConnect = (waitForConnect == undefined || waitForConnect == null) ?
         true : waitForConnect;
-    
-    if( jsTestOptions().useSSL ) {
-        if (!opts.sslMode) opts.sslMode = "requireSSL";
-        if (!opts.sslPEMKeyFile) opts.sslPEMKeyFile = "jstests/libs/server.pem";
-        if (!opts.sslCAFile) opts.sslCAFile = "jstests/libs/ca.pem";
-
-        // Needed for jstest/ssl/upgrade_to_ssl.js
-        opts.sslWeakCertificateValidation = "";
-
-        // Needed for jstest/ssl/ssl_hostname_validation.js
-        opts.sslAllowInvalidHostnames = "";
-    }
 
-    if ( jsTestOptions().useX509 && !opts.clusterAuthMode ) {
-        opts.clusterAuthMode = "x509";
-    }
-    
     opts.port = opts.port || MongoRunner.nextOpenPort()
     MongoRunner.usedPortMap[ "" + parseInt( opts.port ) ] = true
     
@@ -493,22 +477,6 @@ MongoRunner.mongodOptions = function( opts ){
         opts.keyFile = jsTestOptions().keyFile
     }
 
-    if( jsTestOptions().useSSL ) {
-        if (!opts.sslMode) opts.sslMode = "requireSSL";
-        if (!opts.sslPEMKeyFile) opts.sslPEMKeyFile = "jstests/libs/server.pem";
-        if (!opts.sslCAFile) opts.sslCAFile = "jstests/libs/ca.pem";
-
-        // Needed for jstest/ssl/upgrade_to_ssl.js
-        opts.sslWeakCertificateValidation = "";
-
-        // Needed for jstest/ssl/ssl_hostname_validation.js
-        opts.sslAllowInvalidHostnames = "";
-    }
-
-    if ( jsTestOptions().useX509 && !opts.clusterAuthMode ) {
-        opts.clusterAuthMode = "x509";
-    }
-
     if( opts.noReplSet ) opts.replSet = null
     if( opts.arbiter ) opts.oplogSize = 1