tls: requestCert unusable with Firefox and Chrome

Fixes #1516.

2 files changed, 13 insertions, 1 deletions

diff --git a/lib/crypto.js b/lib/crypto.js
index cea601bd65..85bbbcd65c 100644
--- a/lib/crypto.js
+++ b/lib/crypto.js
@@ -104,6 +104,10 @@ exports.createCredentials = function(options, context) {
     }
   }
 
+  if (options.sessionIdContext) {
+    c.context.setSessionIdContext(options.sessionIdContext);
+  }
+
   return c;
 };
 
diff --git a/lib/tls.js b/lib/tls.js
index 6f26ffb455..7e6c5b1d97 100644
--- a/lib/tls.js
+++ b/lib/tls.js
@@ -803,7 +803,8 @@ function Server(/* [options], listener */) {
     ciphers: self.ciphers,
     secureProtocol: self.secureProtocol,
     secureOptions: self.secureOptions,
-    crl: self.crl
+    crl: self.crl,
+    sessionIdContext: self.sessionIdContext
   });
 
   sharedCreds.context.setCiphers('RC4-SHA:AES128-SHA:AES256-SHA');
@@ -892,6 +893,13 @@ Server.prototype.setOptions = function(options) {
   } else {
     this.SNICallback = this.SNICallback.bind(this);
   }
+  if (options.sessionIdContext) {
+    this.sessionIdContext = options.sessionIdContext;
+  } else if (this.requestCert) {
+    this.sessionIdContext = crypto.createHash('md5')
+                                  .update(process.argv.join(' '))
+                                  .digest('hex');
+  }
 };
 
 // SNI Contexts High-Level API