Give SSL_SESSION a destructor. Previously we'd partially attempted the ssl_st / bssl::SSLConnection subclassing split, but that gets messy when we actually try to add a destructor, because CRYPTO_EX_DATA's cleanup function needs an ssl_st*, not a bssl::SSLConnection*. Downcasting is technically undefined at this point and will likely offend some CFI-like check. Moreover, it appears that even with today's subclassing split, New<SSL>() emits symbols like: W ssl_st*& std::forward<ssl_st*&>(std::remove_reference<ssl_st*&>::type&) The compiler does not bother emitting them in optimized builds, but it does suggest we can't really avoid claiming the ssl_st type name at the symbol level, short of doing reinterpret_casts at all API boundaries. And, of course, we've already long claimed it at the #include level. So I've just left this defining directly on ssl_session_st. The cost is we need to write some silly "bssl::" prefixes in the headers, but so it goes. In the likely event we change our minds again, we can always revise this. Change-Id: Ieb429e8eaabe7c2961ef7f8d9234fb71f19a5e2a Reviewed-on: https://boringssl-review.googlesource.com/29587 Commit-Queue: David Benjamin <davidben@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Reviewed-by: Adam Langley <agl@google.com>
diff --git a/ssl/ssl_lib.cc b/ssl/ssl_lib.cc index a153c60..0363e32 100644 --- a/ssl/ssl_lib.cc +++ b/ssl/ssl_lib.cc
@@ -2048,8 +2048,8 @@ return; } - *out = CRYPTO_BUFFER_data(session->signed_cert_timestamp_list); - *out_len = CRYPTO_BUFFER_len(session->signed_cert_timestamp_list); + *out = CRYPTO_BUFFER_data(session->signed_cert_timestamp_list.get()); + *out_len = CRYPTO_BUFFER_len(session->signed_cert_timestamp_list.get()); } void SSL_get0_ocsp_response(const SSL *ssl, const uint8_t **out, @@ -2061,8 +2061,8 @@ return; } - *out = CRYPTO_BUFFER_data(session->ocsp_response); - *out_len = CRYPTO_BUFFER_len(session->ocsp_response); + *out = CRYPTO_BUFFER_data(session->ocsp_response.get()); + *out_len = CRYPTO_BUFFER_len(session->ocsp_response.get()); } int SSL_set_tlsext_host_name(SSL *ssl, const char *name) { @@ -2191,8 +2191,8 @@ void SSL_get0_alpn_selected(const SSL *ssl, const uint8_t **out_data, unsigned *out_len) { if (SSL_in_early_data(ssl) && !ssl->server) { - *out_data = ssl->s3->hs->early_session->early_alpn; - *out_len = ssl->s3->hs->early_session->early_alpn_len; + *out_data = ssl->s3->hs->early_session->early_alpn.data(); + *out_len = ssl->s3->hs->early_session->early_alpn.size(); } else { *out_data = ssl->s3->alpn_selected.data(); *out_len = ssl->s3->alpn_selected.size(); @@ -2545,7 +2545,7 @@ if (session == NULL) { return NULL; } - return session->psk_identity; + return session->psk_identity.get(); } void SSL_set_psk_client_callback(