Commit 03e23a3
committed
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 <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>1 parent b50c22a commit 03e23a3
2 files changed
Lines changed: 12 additions & 12 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -214,7 +214,7 @@ function requestOCSPDone(socket) { | |||
| 214 | 214 | } | |
| 215 | 215 | ||
| 216 | 216 | ||
| 217 | - function onnewsession(key, session) { | ||
| 217 | + function onnewsession(sessionId, session) { | ||
| 218 | 218 | const owner = this[owner_symbol]; | |
| 219 | 219 | ||
| 220 | 220 | if (!owner.server) | |
@@ -238,7 +238,7 @@ function onnewsession(key, session) { | |||
| 238 | 238 | }; | |
| 239 | 239 | ||
| 240 | 240 | owner._newSessionPending = true; | |
| 241 | - if (!owner.server.emit('newSession', key, session, done)) | ||
| 241 | + if (!owner.server.emit('newSession', sessionId, session, done)) | ||
| 242 | 242 | done(); | |
| 243 | 243 | } | |
| 244 | 244 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1510,20 +1510,20 @@ int SSLWrap<Base>::NewSessionCallback(SSL* s, SSL_SESSION* sess) { | |||
| 1510 | 1510 | return 0; | |
| 1511 | 1511 | ||
| 1512 | 1512 | // Serialize session | |
| 1513 | - Local<Object> buff = Buffer::New(env, size).ToLocalChecked(); | ||
| 1514 | - unsigned char* serialized = reinterpret_cast<unsigned char*>( | ||
| 1515 | - Buffer::Data(buff)); | ||
| 1516 | - memset(serialized, 0, size); | ||
| 1517 | - i2d_SSL_SESSION(sess, &serialized); | ||
| 1513 | + Local<Object> session = Buffer::New(env, size).ToLocalChecked(); | ||
| 1514 | + unsigned char* session_data = reinterpret_cast<unsigned char*>( | ||
| 1515 | + Buffer::Data(session)); | ||
| 1516 | + memset(session_data, 0, size); | ||
| 1517 | + i2d_SSL_SESSION(sess, &session_data); | ||
| 1518 | 1518 | ||
| 1519 | 1519 | unsigned int session_id_length; | |
| 1520 | - const unsigned char* session_id = SSL_SESSION_get_id(sess, | ||
| 1521 | - &session_id_length); | ||
| 1522 | - Local<Object> session = Buffer::Copy( | ||
| 1520 | + const unsigned char* session_id_data = SSL_SESSION_get_id(sess, | ||
| 1521 | + &session_id_length); | ||
| 1522 | + Local<Object> session_id = Buffer::Copy( | ||
| 1523 | 1523 | env, | |
| 1524 | - reinterpret_cast<const char*>(session_id), | ||
| 1524 | + reinterpret_cast<const char*>(session_id_data), | ||
| 1525 | 1525 | session_id_length).ToLocalChecked(); | |
| 1526 | - Local<Value> argv[] = { session, buff }; | ||
| 1526 | + Local<Value> argv[] = { session_id, session }; | ||
| 1527 | 1527 | w->new_session_wait_ = true; | |
| 1528 | 1528 | w->MakeCallback(env->onnewsession_string(), arraysize(argv), argv); | |
| 1529 | 1529 | ||
0 commit comments