diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-10-16 09:08:32 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-10-16 09:08:32 -0400 |
| commit | 943fd4a252ad252d7d594622d5988634ddf8f1fc (patch) | |
| tree | 8687e2b53378349c356c8aadedc8b08b736db659 /src/common | |
| parent | 288b3ec6035aad694942960f3b71693907f7e584 (diff) | |
| parent | c1c83eb376a7c89fadb01d1c7082d4aa4125333d (diff) | |
| download | tor-943fd4a252ad252d7d594622d5988634ddf8f1fc.tar.gz tor-943fd4a252ad252d7d594622d5988634ddf8f1fc.zip | |
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/tortls.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/common/tortls.c b/src/common/tortls.c index c13b12fd40..4222f6dbff 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1272,10 +1272,11 @@ tor_tls_context_new(crypto_pk_t *identity, unsigned int key_lifetime, goto error; #endif - /* Tell OpenSSL to use SSL3 or TLS1 but not SSL2. */ + /* Tell OpenSSL to use TLS 1.0 or later but not SSL2 or SSL3. */ if (!(result->ctx = SSL_CTX_new(SSLv23_method()))) goto error; SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv2); + SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv3); /* Prefer the server's ordering of ciphers: the client's ordering has * historically been chosen for fingerprinting resistance. */ @@ -1314,6 +1315,7 @@ tor_tls_context_new(crypto_pk_t *identity, unsigned int key_lifetime, } #endif + /* XXX This block is now obsolete. */ if ( #ifdef DISABLE_SSL3_HANDSHAKE 1 || |