Commit 9cfa91b
crypto: use SSL_get_SSL_CTX.
SSL_get_SSL_CTX returns the SSL_CTX for an SSL. Previously the code
accessed |ssl->ctx| directly, but that's no longer possible with OpenSSL
1.1.0.
SSL_get_SSL_CTX exists all the way back to (at least) OpenSSL 0.9.8 and
so this change should be fully compatible.
PR-URL: #8995
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: Shigeki Ohtsu <ohtsu@ohtsu.org>1 parent 9cc9001 commit 9cfa91b
1 file changed
Lines changed: 4 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1095,7 +1095,7 @@ int SecureContext::TicketKeyCallback(SSL* ssl, | |||
| 1095 | 1095 | static const int kTicketPartSize = 16; | |
| 1096 | 1096 | ||
| 1097 | 1097 | SecureContext* sc = static_cast<SecureContext*>( | |
| 1098 | - SSL_CTX_get_app_data(ssl->ctx)); | ||
| 1098 | + SSL_CTX_get_app_data(SSL_get_SSL_CTX(ssl))); | ||
| 1099 | 1099 | ||
| 1100 | 1100 | Environment* env = sc->env(); | |
| 1101 | 1101 | HandleScope handle_scope(env->isolate()); | |
@@ -1632,7 +1632,7 @@ void SSLWrap<Base>::GetPeerCertificate( | |||
| 1632 | 1632 | // Last certificate should be self-signed | |
| 1633 | 1633 | while (X509_check_issued(cert, cert) != X509_V_OK) { | |
| 1634 | 1634 | X509* ca; | |
| 1635 | - if (SSL_CTX_get_issuer(w->ssl_->ctx, cert, &ca) <= 0) | ||
| 1635 | + if (SSL_CTX_get_issuer(SSL_get_SSL_CTX(w->ssl_), cert, &ca) <= 0) | ||
| 1636 | 1636 | break; | |
| 1637 | 1637 | ||
| 1638 | 1638 | Local<Object> ca_info = X509ToObject(env, ca); | |
@@ -2238,7 +2238,8 @@ void SSLWrap<Base>::SetALPNProtocols( | |||
| 2238 | 2238 | env->alpn_buffer_private_symbol(), | |
| 2239 | 2239 | args[0]).FromJust()); | |
| 2240 | 2240 | // Server should select ALPN protocol from list of advertised by client | |
| 2241 | - SSL_CTX_set_alpn_select_cb(w->ssl_->ctx, SelectALPNCallback, nullptr); | ||
| 2241 | + SSL_CTX_set_alpn_select_cb(SSL_get_SSL_CTX(w->ssl_), SelectALPNCallback, | ||
| 2242 | + nullptr); | ||
| 2242 | 2243 | } | |
| 2243 | 2244 | #endif // TLSEXT_TYPE_application_layer_protocol_negotiation | |
| 2244 | 2245 | } | |
0 commit comments