tls: fix legacy SecurePair session resumption

This seems to have been broken ever since its introduction 5 years ago in commit 75ea11f ("tls: introduce asynchronous `newSession`") and no one complained but that's not going to stop me from fixing it anyway because otherwise I can't write a regression test for issue nodejs#26428. Refs: nodejs#26428
bnoordhuis · Mar 5, 2019 · a061190 · a061190
1 parent d4b6643
commit a061190
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/lib/_tls_legacy.js b/lib/_tls_legacy.js
@@ -691,8 +691,9 @@ function onnewsession(key, session) {
       return;
     once = true;
 
-    if (self.ssl)
-      self.ssl.newSessionDone();
+    // Cycle data
+    self.cleartext.read(0);
+    self.encrypted.read(0);
   }
 }
 

diff --git a/src/env.h b/src/env.h
@@ -216,7 +216,6 @@ class ModuleWrap;
   V(onheaders_string, "onheaders")                                            \
   V(onmessage_string, "onmessage")                                            \
   V(onnewsession_string, "onnewsession")                                      \
-  V(onnewsessiondone_string, "onnewsessiondone")                              \
   V(onocspresponse_string, "onocspresponse")                                  \
   V(ongoawaydata_string, "ongoawaydata")                                      \
   V(onorigin_string, "onorigin")                                              \

diff --git a/src/node_crypto.cc b/src/node_crypto.cc
@@ -2965,9 +2965,6 @@ void Connection::SetShutdownFlags() {
 
 
 void Connection::NewSessionDoneCb() {
-  HandleScope scope(env()->isolate());
-
-  MakeCallback(env()->onnewsessiondone_string(), 0, nullptr);
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -2965,9 +2965,6 @@ void Connection::SetShutdownFlags() { @@
     void Connection::NewSessionDoneCb() {
-      HandleScope scope(env()->isolate());
-      MakeCallback(env()->onnewsessiondone_string(), 0, nullptr);
     }
@@ Expand Down @@