nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 12:23:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Stop poking SSL_CTX->comp_methods

Browse Source
This commit is contained in:
Nick Mathewson 2015-05-14 10:24:02 -04:00
parent b7f3d52865
commit f0a0568e7f
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/tortls.c
View File

@ -1365,12 +1365,17 @@ tor_tls_context_new(crypto_pk_t *identity, unsigned int key_lifetime,
SSL_CTX_set_options(result->ctx, SSL_CTX_set_options(result->ctx,
SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION); SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION);
} }
#ifdef SSL_OP_NO_COMPRESSION
SSL_CTX_set_options(result->ctx, SSL_OP_NO_COMPRESSION);
#endif
#if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(1,1,0)
#ifndef OPENSSL_NO_COMP #ifndef OPENSSL_NO_COMP
/* Don't actually allow compression; it uses ram and time, but the data /* Don't actually allow compression; it uses ram and time, but the data
* we transmit is all encrypted anyway. */ * we transmit is all encrypted anyway. */
if (result->ctx->comp_methods) if (result->ctx->comp_methods)
result->ctx->comp_methods = NULL; result->ctx->comp_methods = NULL;
#endif #endif
#endif
#ifdef SSL_MODE_RELEASE_BUFFERS #ifdef SSL_MODE_RELEASE_BUFFERS
SSL_CTX_set_mode(result->ctx, SSL_MODE_RELEASE_BUFFERS); SSL_CTX_set_mode(result->ctx, SSL_MODE_RELEASE_BUFFERS);
#endif #endif