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

Merge remote-tracking branch 'public/bug12602_024' into maint-0.2.5

Browse Source
This commit is contained in:
Nick Mathewson 2014-07-17 11:32:16 +02:00
commit f6a776d915
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug12602 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (portability):
- Compile correctly with builds and forks of OpenSSL (such as
LibreSSL) that disable compression. Fixes bug 12602; bugfix on
0.2.1.1-alpha. Patch from "dhill".

2
src/common/tortls.c
View File

@ -1318,10 +1318,12 @@ 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);
} }
#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
#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