diff options
| author | Tobias Nießen <tniessen@tnie.de> | 2023-03-15 17:38:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-15 16:38:58 +0000 |
| commit | 124bda90e9f5177dbce6198580f93a0d21b91484 (patch) | |
| tree | f7bb8a981ff362bb88660c349a93c36360800a2c /src | |
| parent | e6b4d30a2f8ff0b43bbfd98e0e9f3a15438a4952 (diff) | |
| download | node-new-124bda90e9f5177dbce6198580f93a0d21b91484.tar.gz | |
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.
PR-URL: https://github.com/nodejs/node/pull/47068
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/crypto/crypto_context.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/crypto/crypto_context.cc b/src/crypto/crypto_context.cc index b9f323035f..cb03cd7643 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<Value>& 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<Value>& 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<Value>& 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<Value>& 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 |