diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-07-17 11:32:16 +0200 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-07-17 11:32:16 +0200 |
| commit | f6a776d91565a88bd430152cc38c0a2019aac33b (patch) | |
| tree | faae9e3dd454702170db3b77fb0a4505a18c6540 | |
| parent | 9e46855538e9b848b7c37fda502e5d109079cee0 (diff) | |
| parent | 66798dfdc069ffc2ce1a9cb84529d2015dd3cd66 (diff) | |
| download | tor-f6a776d91565a88bd430152cc38c0a2019aac33b.tar.gz tor-f6a776d91565a88bd430152cc38c0a2019aac33b.zip | |
Merge remote-tracking branch 'public/bug12602_024' into maint-0.2.5
| -rw-r--r-- | changes/bug12602 | 5 | ||||
| -rw-r--r-- | src/common/tortls.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/changes/bug12602 b/changes/bug12602 new file mode 100644 index 0000000000..29fa49ac45 --- /dev/null +++ b/changes/bug12602 @@ -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". + diff --git a/src/common/tortls.c b/src/common/tortls.c index ea0f21cb27..4fd9bba380 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1318,10 +1318,12 @@ tor_tls_context_new(crypto_pk_t *identity, unsigned int key_lifetime, SSL_CTX_set_options(result->ctx, SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION); } +#ifndef OPENSSL_NO_COMP /* Don't actually allow compression; it uses ram and time, but the data * we transmit is all encrypted anyway. */ if (result->ctx->comp_methods) result->ctx->comp_methods = NULL; +#endif #ifdef SSL_MODE_RELEASE_BUFFERS SSL_CTX_set_mode(result->ctx, SSL_MODE_RELEASE_BUFFERS); #endif |