[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.2

[nickm@xxxxxxxxxxxxxx]

commit 0366ae224cb3b9cd55905201cd1b55a03f2736e9
Merge: 987e12a58 1e46a391b
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Sep 7 09:15:52 2018 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug27344    | 4 ++++
 configure.ac        | 1 +
 src/common/tortls.c | 7 ++++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --cc src/common/tortls.c
index 03c0be1cd,1f2fe1ce1..6efc8c3e4
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@@ -1171,7 -1129,12 +1171,13 @@@ tor_tls_context_new(crypto_pk_t *identi
  #else
    if (!(result->ctx = SSL_CTX_new(SSLv23_method())))
      goto error;
 -#endif
 +#endif /* defined(HAVE_TLS_METHOD) */
++
+ #ifdef HAVE_SSL_CTX_SET_SECURITY_LEVEL
+   /* Level 1 re-enables RSA1024 and DH1024 for compatibility with old tors */
+   SSL_CTX_set_security_level(result->ctx, 1);
+ #endif
+ 
    SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv2);
    SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv3);
  



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits