nodejs
diff --git a/Collapse file
‎doc/api/tls.markdown‎
Copy file name to clipboardExpand all lines: doc/api/tls.markdown
+3-3Lines changed: 3 additions & 3 deletions
Display the source diff
Display the rich diff b/Collapse file
‎doc/api/tls.markdown‎
Copy file name to clipboardExpand all lines: doc/api/tls.markdown
+3-3Lines changed: 3 additions & 3 deletions
Display the source diff
Display the rich diff
diff --git a/Collapse file
‎lib/_tls_wrap.js‎
Copy file name to clipboardExpand all lines: lib/_tls_wrap.js
+4-16Lines changed: 4 additions & 16 deletions b/Collapse file
‎lib/_tls_wrap.js‎
Copy file name to clipboardExpand all lines: lib/_tls_wrap.js
+4-16Lines changed: 4 additions & 16 deletions
@@ -841,9 +841,9 @@ automatically set as a listener for the [secureConnection][] event.  The
     NOTE: Automatically shared between `cluster` module workers.
 
   - `sessionIdContext`: A string containing an opaque identifier for session
-    resumption. If `requestCert` is `true`, the default is MD5 hash value
-    generated from command-line. (In FIPS mode a truncated SHA1 hash is
-    used instead.) Otherwise, the default is not provided.
+    resumption. If `requestCert` is `true`, the default is a 128 bit
+    truncated SHA1 hash value generated from command-line. Otherwise,
+    the default is not provided.
 
   - `secureProtocol`: The SSL method to use, e.g. `SSLv3_method` to force
     SSL version 3. The possible values depend on your installation of
 
@@ -14,21 +14,6 @@ const Timer = process.binding('timer_wrap').Timer;
 const tls_wrap = process.binding('tls_wrap');
 const TCP = process.binding('tcp_wrap').TCP;
 const Pipe = process.binding('pipe_wrap').Pipe;
-const defaultSessionIdContext = getDefaultSessionIdContext();
-
-function getDefaultSessionIdContext() {
-  var defaultText = process.argv.join(' ');
-  /* SSL_MAX_SID_CTX_LENGTH is 128 bits */
-  if (process.config.variables.openssl_fips) {
-    return crypto.createHash('sha1')
-      .update(defaultText)
-      .digest('hex').slice(0, 32);
-  } else {
-    return crypto.createHash('md5')
-      .update(defaultText)
-      .digest('hex');
-  }
-}
 
 function onhandshakestart() {
   debug('onhandshakestart');
@@ -908,7 +893,10 @@ Server.prototype.setOptions = function(options) {
   if (options.sessionIdContext) {
     this.sessionIdContext = options.sessionIdContext;
   } else {
-    this.sessionIdContext = defaultSessionIdContext;
+    this.sessionIdContext = crypto.createHash('sha1')
+                                  .update(process.argv.join(' '))
+                                  .digest('hex')
+                                  .slice(0, 32);
   }
 };