tls: do not confuse session and session ID

session ID was named session in C++ and key in JS, Name them after what they are, as the 'newSession' event docs do. PR-URL: #25153 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Anatoli Papirovski <[email protected]>
nodejs · Dec 28, 2018 · 03e23a3 · 03e23a3
1 parent b50c22a
commit 03e23a3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/lib/_tls_wrap.js b/lib/_tls_wrap.js
@@ -214,7 +214,7 @@ function requestOCSPDone(socket) {
 }
 
 
-function onnewsession(key, session) {
+function onnewsession(sessionId, session) {
   const owner = this[owner_symbol];
 
   if (!owner.server)
@@ -238,7 +238,7 @@ function onnewsession(key, session) {
   };
 
   owner._newSessionPending = true;
-  if (!owner.server.emit('newSession', key, session, done))
+  if (!owner.server.emit('newSession', sessionId, session, done))
     done();
 }
 

diff --git a/src/node_crypto.cc b/src/node_crypto.cc
@@ -1510,20 +1510,20 @@ int SSLWrap<Base>::NewSessionCallback(SSL* s, SSL_SESSION* sess) {
     return 0;
 
   // Serialize session
-  Local<Object> buff = Buffer::New(env, size).ToLocalChecked();
-  unsigned char* serialized = reinterpret_cast<unsigned char*>(
-      Buffer::Data(buff));
-  memset(serialized, 0, size);
-  i2d_SSL_SESSION(sess, &serialized);
+  Local<Object> session = Buffer::New(env, size).ToLocalChecked();
+  unsigned char* session_data = reinterpret_cast<unsigned char*>(
+      Buffer::Data(session));
+  memset(session_data, 0, size);
+  i2d_SSL_SESSION(sess, &session_data);
 
   unsigned int session_id_length;
-  const unsigned char* session_id = SSL_SESSION_get_id(sess,
-                                                       &session_id_length);
-  Local<Object> session = Buffer::Copy(
+  const unsigned char* session_id_data = SSL_SESSION_get_id(sess,
+                                                            &session_id_length);
+  Local<Object> session_id = Buffer::Copy(
       env,
-      reinterpret_cast<const char*>(session_id),
+      reinterpret_cast<const char*>(session_id_data),
       session_id_length).ToLocalChecked();
-  Local<Value> argv[] = { session, buff };
+  Local<Value> argv[] = { session_id, session };
   w->new_session_wait_ = true;
   w->MakeCallback(env->onnewsession_string(), arraysize(argv), argv);