Skip to content

Commit aefe266

Browse files
tniessentargos
authored andcommitted
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: #47068 Reviewed-By: Filip Skokan <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
1 parent 316d626 commit aefe266

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

src/crypto/crypto_context.cc

-5
Original file line numberDiff line numberDiff line change
@@ -1123,8 +1123,6 @@ void SecureContext::SetClientCertEngine(
11231123
#endif // !OPENSSL_NO_ENGINE
11241124

11251125
void SecureContext::GetTicketKeys(const FunctionCallbackInfo<Value>& args) {
1126-
#if !defined(OPENSSL_NO_TLSEXT) && defined(SSL_CTX_get_tlsext_ticket_keys)
1127-
11281126
SecureContext* wrap;
11291127
ASSIGN_OR_RETURN_UNWRAP(&wrap, args.Holder());
11301128

@@ -1137,11 +1135,9 @@ void SecureContext::GetTicketKeys(const FunctionCallbackInfo<Value>& args) {
11371135
memcpy(Buffer::Data(buff) + 32, wrap->ticket_key_aes_, 16);
11381136

11391137
args.GetReturnValue().Set(buff);
1140-
#endif // !def(OPENSSL_NO_TLSEXT) && def(SSL_CTX_get_tlsext_ticket_keys)
11411138
}
11421139

11431140
void SecureContext::SetTicketKeys(const FunctionCallbackInfo<Value>& args) {
1144-
#if !defined(OPENSSL_NO_TLSEXT) && defined(SSL_CTX_get_tlsext_ticket_keys)
11451141
SecureContext* wrap;
11461142
ASSIGN_OR_RETURN_UNWRAP(&wrap, args.Holder());
11471143

@@ -1156,7 +1152,6 @@ void SecureContext::SetTicketKeys(const FunctionCallbackInfo<Value>& args) {
11561152
memcpy(wrap->ticket_key_aes_, buf.data() + 32, 16);
11571153

11581154
args.GetReturnValue().Set(true);
1159-
#endif // !def(OPENSSL_NO_TLSEXT) && def(SSL_CTX_get_tlsext_ticket_keys)
11601155
}
11611156

11621157
// Currently, EnableTicketKeyCallback and TicketKeyCallback are only present for

0 commit comments

Comments
 (0)