Commit 5501d12
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 <panva.ip@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>1 parent 309d017 commit 5501d12
1 file changed
Lines changed: 0 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1123,8 +1123,6 @@ void SecureContext::SetClientCertEngine( | |||
| 1123 | 1123 | #endif // !OPENSSL_NO_ENGINE | |
| 1124 | 1124 | ||
| 1125 | 1125 | void SecureContext::GetTicketKeys(const FunctionCallbackInfo<Value>& args) { | |
| 1126 | - #if !defined(OPENSSL_NO_TLSEXT) && defined(SSL_CTX_get_tlsext_ticket_keys) | ||
| 1127 | - | ||
| 1128 | 1126 | SecureContext* wrap; | |
| 1129 | 1127 | ASSIGN_OR_RETURN_UNWRAP(&wrap, args.Holder()); | |
| 1130 | 1128 | ||
@@ -1137,11 +1135,9 @@ void SecureContext::GetTicketKeys(const FunctionCallbackInfo<Value>& args) { | |||
| 1137 | 1135 | memcpy(Buffer::Data(buff) + 32, wrap->ticket_key_aes_, 16); | |
| 1138 | 1136 | ||
| 1139 | 1137 | args.GetReturnValue().Set(buff); | |
| 1140 | - #endif // !def(OPENSSL_NO_TLSEXT) && def(SSL_CTX_get_tlsext_ticket_keys) | ||
| 1141 | 1138 | } | |
| 1142 | 1139 | ||
| 1143 | 1140 | void SecureContext::SetTicketKeys(const FunctionCallbackInfo<Value>& args) { | |
| 1144 | - #if !defined(OPENSSL_NO_TLSEXT) && defined(SSL_CTX_get_tlsext_ticket_keys) | ||
| 1145 | 1141 | SecureContext* wrap; | |
| 1146 | 1142 | ASSIGN_OR_RETURN_UNWRAP(&wrap, args.Holder()); | |
| 1147 | 1143 | ||
@@ -1156,7 +1152,6 @@ void SecureContext::SetTicketKeys(const FunctionCallbackInfo<Value>& args) { | |||
| 1156 | 1152 | memcpy(wrap->ticket_key_aes_, buf.data() + 32, 16); | |
| 1157 | 1153 | ||
| 1158 | 1154 | args.GetReturnValue().Set(true); | |
| 1159 | - #endif // !def(OPENSSL_NO_TLSEXT) && def(SSL_CTX_get_tlsext_ticket_keys) | ||
| 1160 | 1155 | } | |
| 1161 | 1156 | ||
| 1162 | 1157 | // Currently, EnableTicketKeyCallback and TicketKeyCallback are only present for | |
0 commit comments