torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3

Browse Source
This commit is contained in:
Nick Mathewson
2012-10-19 00:58:33 -04:00
parent e2549c3b74 8743080a28
commit a0e9dc9f55
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/tortls.c
+8
View File
@@ -1195,6 +1195,14 @@ tor_tls_context_new(crypto_pk_t *identity, unsigned int key_lifetime,
#ifdef SSL_OP_NO_TLSv1_1
SSL_CTX_set_options(result->ctx, SSL_OP_NO_TLSv1_1);
#endif
/* Disable TLS tickets if they're supported. We never want to use them;
* using them can make our perfect forward secrecy a little worse, *and*
* create an opportunity to fingerprint us (since it's unusual to use them
* with TLS sessions turned off).
*/
#ifdef SSL_OP_NO_TICKET
SSL_CTX_set_options(result->ctx, SSL_OP_NO_TICKET);
#endif
if (
#ifdef DISABLE_SSL3_HANDSHAKE