From fc900e20b516d4ad6eb26a74183e9a81c9444b4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20Nie=C3=9Fen?= Date: Mon, 22 Aug 2022 15:45:58 +0200 Subject: [PATCH] tls: remove SecureContext setFreeListLength This function was introduced in 2684c902c4ff90711e57e787c5bfe0bac33bcd49 as an internal helper function. The C++ implementation became a no-op in a57e2f2138c37e636e1f7684ab07cb36eea79716 when building against OpenSSL 1.1.0 (instead of OpenSSL 1.0.2), and eventually became a no-op in all supported OpenSSL versions in 970ce14f61a44504520581c5af5dc9c3bddc0f40. Finally, eb20447407d428dbb239ca0765ba6273975ed663 removed the only call site of setFreeListLength (which was already a no-op at that point). Refs: https://github.com/nodejs/node/pull/1529 Refs: https://github.com/nodejs/node/pull/10859 Refs: https://github.com/nodejs/node/pull/19794 Refs: https://github.com/nodejs/node/pull/38116 PR-URL: https://github.com/nodejs/node/pull/44300 Reviewed-By: Feng Yu Reviewed-By: Mohammed Keyvanzadeh Reviewed-By: Anna Henningsen --- src/crypto/crypto_context.cc | 5 ----- src/crypto/crypto_context.h | 2 -- 2 files changed, 7 deletions(-) diff --git a/src/crypto/crypto_context.cc b/src/crypto/crypto_context.cc index 88dfb3775520c2..cd68bfef391ce0 100644 --- a/src/crypto/crypto_context.cc +++ b/src/crypto/crypto_context.cc @@ -283,7 +283,6 @@ Local SecureContext::GetConstructorTemplate( env->SetProtoMethod(tmpl, "close", Close); env->SetProtoMethod(tmpl, "loadPKCS12", LoadPKCS12); env->SetProtoMethod(tmpl, "setTicketKeys", SetTicketKeys); - env->SetProtoMethod(tmpl, "setFreeListLength", SetFreeListLength); env->SetProtoMethod(tmpl, "enableTicketKeyCallback", EnableTicketKeyCallback); @@ -363,7 +362,6 @@ void SecureContext::RegisterExternalReferences( registry->Register(Close); registry->Register(LoadPKCS12); registry->Register(SetTicketKeys); - registry->Register(SetFreeListLength); registry->Register(EnableTicketKeyCallback); registry->Register(GetTicketKeys); registry->Register(GetCertificate); @@ -1119,9 +1117,6 @@ void SecureContext::SetTicketKeys(const FunctionCallbackInfo& args) { #endif // !def(OPENSSL_NO_TLSEXT) && def(SSL_CTX_get_tlsext_ticket_keys) } -void SecureContext::SetFreeListLength(const FunctionCallbackInfo& args) { -} - // Currently, EnableTicketKeyCallback and TicketKeyCallback are only present for // the regression test in test/parallel/test-https-resume-after-renew.js. void SecureContext::EnableTicketKeyCallback( diff --git a/src/crypto/crypto_context.h b/src/crypto/crypto_context.h index ee2df97ac21411..4dfd0dfa032cf7 100644 --- a/src/crypto/crypto_context.h +++ b/src/crypto/crypto_context.h @@ -100,8 +100,6 @@ class SecureContext final : public BaseObject { #endif // !OPENSSL_NO_ENGINE static void GetTicketKeys(const v8::FunctionCallbackInfo& args); static void SetTicketKeys(const v8::FunctionCallbackInfo& args); - static void SetFreeListLength( - const v8::FunctionCallbackInfo& args); static void EnableTicketKeyCallback( const v8::FunctionCallbackInfo& args); static void CtxGetter(const v8::FunctionCallbackInfo& info);