diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-10-19 00:58:33 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-10-19 00:58:33 -0400 |
| commit | a0e9dc9f55a452d78d9d16b4a2fc7d57dafa0409 (patch) | |
| tree | 1911e3433a3f12f6c42a6a0fa6a573bfdebdf09d /src/common/tortls.c | |
| parent | e2549c3b745313d6647c7e1d05025a84e1d33873 (diff) | |
| parent | 8743080a289a20bfaf0a67d6382ba0c2a6d6534d (diff) | |
| download | tor-a0e9dc9f55a452d78d9d16b4a2fc7d57dafa0409.tar tor-a0e9dc9f55a452d78d9d16b4a2fc7d57dafa0409.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
Diffstat (limited to 'src/common/tortls.c')
| -rw-r--r-- | src/common/tortls.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/common/tortls.c b/src/common/tortls.c index 53bcc9891..bec2c7123 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -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 |