Commit a36cd51b authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge remote-tracking branch 'origin/maint-0.2.5'

parents 7259e3f6 f6a776d9

changes/bug12602

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  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".

src/common/tortls.c

+2 −0
Original line number Diff line number Diff line
@@ -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