Skip to content
Snippets Groups Projects
Commit 5db21f8f authored by Yawning Angel's avatar Yawning Angel Committed by Nick Mathewson
Browse files

OpenSSL 1.1.0-pre5-dev and later made BIO opaque.

Detect newer versions and fix our TLS code to use the new API.
parent 6729d732
Branches
Tags
No related merge requests found
......@@ -2274,8 +2274,18 @@ tor_tls_get_n_raw_bytes(tor_tls_t *tls, size_t *n_read, size_t *n_written)
* save the original BIO for tls->ssl in the tor_tls_t structure, but
* that would be tempting fate. */
wbio = SSL_get_wbio(tls->ssl);
#if OPENSSL_VERSION_NUMBER >= OPENSSL_VER(1,1,0,0,5)
/* BIO structure is opaque as of OpenSSL 1.1.0-pre5-dev. Again, not
* supposed to use this form of the version macro, but the OpenSSL developers
* introduced major API changes in the pre-release stage.
*/
if (BIO_method_type(wbio) == BIO_TYPE_BUFFER &&
(tmpbio = BIO_next(wbio)) != NULL)
wbio = tmpbio;
#else
if (wbio->method == BIO_f_buffer() && (tmpbio = BIO_next(wbio)) != NULL)
wbio = tmpbio;
#endif
w = BIO_number_written(wbio);
/* We are ok with letting these unsigned ints go "negative" here:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment