From 67a7232e72f9b71fc03fe90ddfdeb7f09cc20bd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20Nie=C3=9Fen?= Date: Mon, 13 Mar 2023 16:24:14 +0000 Subject: [PATCH] src: remove SSL_CTX_get_tlsext_ticket_keys guards OPENSSL_NO_TLSEXT was removed from OpenSSL a long time ago and both OpenSSL and BoringSSL always unconditionally define SSL_CTX_get_tlsext_ticket_keys now. --- src/crypto/crypto_context.cc | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/crypto/crypto_context.cc b/src/crypto/crypto_context.cc index b9f323035ff543..cb03cd7643909f 100644 --- a/src/crypto/crypto_context.cc +++ b/src/crypto/crypto_context.cc @@ -1123,8 +1123,6 @@ void SecureContext::SetClientCertEngine( #endif // !OPENSSL_NO_ENGINE void SecureContext::GetTicketKeys(const FunctionCallbackInfo& args) { -#if !defined(OPENSSL_NO_TLSEXT) && defined(SSL_CTX_get_tlsext_ticket_keys) - SecureContext* wrap; ASSIGN_OR_RETURN_UNWRAP(&wrap, args.Holder()); @@ -1137,11 +1135,9 @@ void SecureContext::GetTicketKeys(const FunctionCallbackInfo& args) { memcpy(Buffer::Data(buff) + 32, wrap->ticket_key_aes_, 16); args.GetReturnValue().Set(buff); -#endif // !def(OPENSSL_NO_TLSEXT) && def(SSL_CTX_get_tlsext_ticket_keys) } void SecureContext::SetTicketKeys(const FunctionCallbackInfo& args) { -#if !defined(OPENSSL_NO_TLSEXT) && defined(SSL_CTX_get_tlsext_ticket_keys) SecureContext* wrap; ASSIGN_OR_RETURN_UNWRAP(&wrap, args.Holder()); @@ -1156,7 +1152,6 @@ void SecureContext::SetTicketKeys(const FunctionCallbackInfo& args) { memcpy(wrap->ticket_key_aes_, buf.data() + 32, 16); args.GetReturnValue().Set(true); -#endif // !def(OPENSSL_NO_TLSEXT) && def(SSL_CTX_get_tlsext_ticket_keys) } // Currently, EnableTicketKeyCallback and TicketKeyCallback are only present for