crypto: add ticketKeys option in createSecureContext

There's a method to initialize a TLS Server using tls.createSever by specifying a ticketKeys option, but none in the underlying constructor, tls.createSecureContext. This PR adds the ticketKeys option to tls.createSecureContext. Fixes: nodejs#20908
ryzokuken · May 23, 2018 · 2594cd2 · 2594cd2
1 parent c89669d
commit 2594cd2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/lib/_tls_common.js b/lib/_tls_common.js
@@ -223,6 +223,11 @@ exports.createSecureContext = function createSecureContext(options, context) {
                                    options.clientCertEngine);
   }
 
+  // Set ticketKeys right inside createSecureContext
+  if (options.ticketKeys) {
+    c.context.setTicketKeys(options.ticketKeys);
+  }
+
   return c;
 };
 

diff --git a/lib/_tls_wrap.js b/lib/_tls_wrap.js
@@ -885,7 +885,8 @@ function Server(options, listener) {
     secureOptions: this.secureOptions,
     honorCipherOrder: this.honorCipherOrder,
     crl: this.crl,
-    sessionIdContext: this.sessionIdContext
+    sessionIdContext: this.sessionIdContext,
+    ticketKeys: this.ticketKeys
   });
 
   this[kHandshakeTimeout] = options.handshakeTimeout || (120 * 1000);
@@ -900,10 +901,6 @@ function Server(options, listener) {
     this._sharedCreds.context.setSessionTimeout(this.sessionTimeout);
   }
 
-  if (this.ticketKeys) {
-    this._sharedCreds.context.setTicketKeys(this.ticketKeys);
-  }
-
   // constructor call
   net.Server.call(this, tlsConnectionListener);