Commit f6b2ea8
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 d5ba121 commit f6b2ea8
2 files changed
Lines changed: 12 additions & 12 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -212,7 +212,7 @@ function requestOCSPDone(socket) { | |||
| 212 | 212 | } | |
| 213 | 213 | ||
| 214 | 214 | ||
| 215 | - function onnewsession(key, session) { | ||
| 215 | + function onnewsession(sessionId, session) { | ||
| 216 | 216 | const owner = this[owner_symbol]; | |
| 217 | 217 | ||
| 218 | 218 | if (!owner.server) | |
@@ -236,7 +236,7 @@ function onnewsession(key, session) { | |||
| 236 | 236 | }; | |
| 237 | 237 | ||
| 238 | 238 | owner._newSessionPending = true; | |
| 239 | - if (!owner.server.emit('newSession', key, session, done)) | ||
| 239 | + if (!owner.server.emit('newSession', sessionId, session, done)) | ||
| 240 | 240 | done(); | |
| 241 | 241 | } | |
| 242 | 242 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1483,20 +1483,20 @@ int SSLWrap<Base>::NewSessionCallback(SSL* s, SSL_SESSION* sess) { | |||
| 1483 | 1483 | return 0; | |
| 1484 | 1484 | ||
| 1485 | 1485 | // Serialize session | |
| 1486 | - Local<Object> buff = Buffer::New(env, size).ToLocalChecked(); | ||
| 1487 | - unsigned char* serialized = reinterpret_cast<unsigned char*>( | ||
| 1488 | - Buffer::Data(buff)); | ||
| 1489 | - memset(serialized, 0, size); | ||
| 1490 | - i2d_SSL_SESSION(sess, &serialized); | ||
| 1486 | + Local<Object> session = Buffer::New(env, size).ToLocalChecked(); | ||
| 1487 | + unsigned char* session_data = reinterpret_cast<unsigned char*>( | ||
| 1488 | + Buffer::Data(session)); | ||
| 1489 | + memset(session_data, 0, size); | ||
| 1490 | + i2d_SSL_SESSION(sess, &session_data); | ||
| 1491 | 1491 | ||
| 1492 | 1492 | unsigned int session_id_length; | |
| 1493 | - const unsigned char* session_id = SSL_SESSION_get_id(sess, | ||
| 1494 | - &session_id_length); | ||
| 1495 | - Local<Object> session = Buffer::Copy( | ||
| 1493 | + const unsigned char* session_id_data = SSL_SESSION_get_id(sess, | ||
| 1494 | + &session_id_length); | ||
| 1495 | + Local<Object> session_id = Buffer::Copy( | ||
| 1496 | 1496 | env, | |
| 1497 | - reinterpret_cast<const char*>(session_id), | ||
| 1497 | + reinterpret_cast<const char*>(session_id_data), | ||
| 1498 | 1498 | session_id_length).ToLocalChecked(); | |
| 1499 | - Local<Value> argv[] = { session, buff }; | ||
| 1499 | + Local<Value> argv[] = { session_id, session }; | ||
| 1500 | 1500 | w->new_session_wait_ = true; | |
| 1501 | 1501 | w->MakeCallback(env->onnewsession_string(), arraysize(argv), argv); | |
| 1502 | 1502 | ||
0 commit comments