Skip to content

Commit 8dc4039

Browse files
davidbenaddaleax
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: nodejs/node#15348 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
1 parent 29a3b3a commit 8dc4039

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
@@ -1427,10 +1427,13 @@ int SSLWrap<Base>::NewSessionCallback(SSL* s, SSL_SESSION* sess) {
14271427
memset(serialized, 0, size);
14281428
i2d_SSL_SESSION(sess, &serialized);
14291429

1430+
unsigned int session_id_length;
1431+
const unsigned char* session_id = SSL_SESSION_get_id(sess,
1432+
&session_id_length);
14301433
Local<Object> session = Buffer::Copy(
14311434
env,
1432-
reinterpret_cast<char*>(sess->session_id),
1433-
sess->session_id_length).ToLocalChecked();
1435+
reinterpret_cast<const char*>(session_id),
1436+
session_id_length).ToLocalChecked();
14341437
Local<Value> argv[] = { session, buff };
14351438
w->new_session_wait_ = true;
14361439
w->MakeCallback(env->onnewsession_string(), arraysize(argv), argv);

0 commit comments

Comments
 (0)