From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 7 Sep 2018 13:15:52 +0000 (-0400)
Subject: Merge branch 'maint-0.2.9' into maint-0.3.2
X-Git-Tag: tor-0.3.2.12~4^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0366ae224cb3b9cd55905201cd1b55a03f2736e9;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.9' into maint-0.3.2
---

0366ae224cb3b9cd55905201cd1b55a03f2736e9
diff --cc src/common/tortls.c
index 03c0be1cd0,1f2fe1ce18..6efc8c3e4b
--- 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);