diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-09-07 09:15:56 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-09-07 09:15:56 -0400 |
| commit | 8849b2ca3c3943e7d2f109b8e56179be82092a6e (patch) | |
| tree | 8a160d71d372dad71569315a50c439fbc073daa5 /src | |
| parent | 967cef2f8f5ad654aa0d53e1516fd26bc18a00e8 (diff) | |
| parent | 732ea9120c9db5d6368cba6f2b789aa4fca5db31 (diff) | |
| download | tor-8849b2ca3c3943e7d2f109b8e56179be82092a6e.tar.gz tor-8849b2ca3c3943e7d2f109b8e56179be82092a6e.zip | |
Merge branch 'maint-0.3.3' into maint-0.3.4
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/tortls.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/common/tortls.c b/src/common/tortls.c index 94db04b9d5..08aa35a480 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1193,6 +1193,12 @@ tor_tls_context_new(crypto_pk_t *identity, unsigned int key_lifetime, if (!(result->ctx = SSL_CTX_new(SSLv23_method()))) goto error; #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); @@ -2662,4 +2668,3 @@ evaluate_ecgroup_for_tls(const char *ecgroup) return ret; } - |