diff options
author | Sam Roberts <vieuxtech@gmail.com> | 2018-12-19 14:45:51 -0800 |
---|---|---|
committer | Sam Roberts <vieuxtech@gmail.com> | 2018-12-28 12:57:41 -0800 |
commit | 03e23a3d10ba66141ff32d668e02a6ce1cdb6b46 (patch) | |
tree | 59847a3447c2a424abfd97fc01c04c82aefea98d | |
parent | b50c22a904e669551f818bab0472c70d6d3b25c5 (diff) | |
download | android-node-v8-03e23a3d10ba66141ff32d668e02a6ce1cdb6b46.tar.gz android-node-v8-03e23a3d10ba66141ff32d668e02a6ce1cdb6b46.tar.bz2 android-node-v8-03e23a3d10ba66141ff32d668e02a6ce1cdb6b46.zip |
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: https://github.com/nodejs/node/pull/25153
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
-rw-r--r-- | lib/_tls_wrap.js | 4 | ||||
-rw-r--r-- | src/node_crypto.cc | 20 |
2 files changed, 12 insertions, 12 deletions
diff --git a/lib/_tls_wrap.js b/lib/_tls_wrap.js index 1fc339cc2e..b07812f1a6 100644 --- 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 index 8d5ac86919..201b1815e1 100644 --- 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); |