Skip to content

Commit 93d5ead

Browse files
davidbenMylesBorins
authored andcommitted
crypto: use SSL_SESSION_get_id
This accessor exists in OpenSSL 1.0.2, so it may be used already. This is cherry-picked from PR #8491. PR-URL: #15348 Reviewed-By: Ben Noordhuis <[email protected]>
1 parent ed8c89a commit 93d5ead

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/node_crypto.cc

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1424,10 +1424,13 @@ int SSLWrap<Base>::NewSessionCallback(SSL* s, SSL_SESSION* sess) {
14241424
memset(serialized, 0, size);
14251425
i2d_SSL_SESSION(sess, &serialized);
14261426

1427+
unsigned int session_id_length;
1428+
const unsigned char* session_id = SSL_SESSION_get_id(sess,
1429+
&session_id_length);
14271430
Local<Object> session = Buffer::Copy(
14281431
env,
1429-
reinterpret_cast<char*>(sess->session_id),
1430-
sess->session_id_length).ToLocalChecked();
1432+
reinterpret_cast<const char*>(session_id),
1433+
session_id_length).ToLocalChecked();
14311434
Local<Value> argv[] = { session, buff };
14321435
w->new_session_wait_ = true;
14331436
w->MakeCallback(env->onnewsession_string(), arraysize(argv), argv);

0 commit comments

Comments
 (0)