diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-07-17 11:34:33 +0200 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-07-17 11:34:33 +0200 |
| commit | a36cd51b59f3fbd99041904ac5b963a296aabefb (patch) | |
| tree | eec9e6ba6391c9c492aa305e021eb0003d2eeeee /src/common/tortls.c | |
| parent | 7259e3f6049c7a644cb1c797432d29b57a5c0589 (diff) | |
| parent | f6a776d91565a88bd430152cc38c0a2019aac33b (diff) | |
| download | tor-a36cd51b59f3fbd99041904ac5b963a296aabefb.tar.gz tor-a36cd51b59f3fbd99041904ac5b963a296aabefb.zip | |
Merge remote-tracking branch 'origin/maint-0.2.5'
Diffstat (limited to 'src/common/tortls.c')
| -rw-r--r-- | src/common/tortls.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/common/tortls.c b/src/common/tortls.c index e06a2ae946..0f989684cf 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1314,10 +1314,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 |