diff options
| author | Roger Dingledine <arma@torproject.org> | 2012-01-08 12:17:16 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2012-01-08 12:17:16 -0500 |
| commit | ecdea4eeafd921f0dcb053f2585d9cb05d6df658 (patch) | |
| tree | 928e863bccd8dd871eaf098bb77a2a1541510fad /src/common/tortls.c | |
| parent | 59d0a5ae693efe9321e03302515d405094998e43 (diff) | |
| parent | cc1580dbe02f0f285fca65b7b388d99dbaf78f5c (diff) | |
| download | tor-ecdea4eeafd921f0dcb053f2585d9cb05d6df658.tar.gz tor-ecdea4eeafd921f0dcb053f2585d9cb05d6df658.zip | |
Merge branch 'maint-0.2.2'
Diffstat (limited to 'src/common/tortls.c')
| -rw-r--r-- | src/common/tortls.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/common/tortls.c b/src/common/tortls.c index 81de5c18cd..ac6b74fa83 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1164,6 +1164,11 @@ tor_tls_context_new(crypto_pk_env_t *identity, unsigned int key_lifetime, * with clients that are configured to use SSLv23_method(), so we should * probably never use it. */ + /* XXX wanoskarnet says this comment is bunk -- that even if we turn + * this line on, clients configured to use SSLv23 would still able to + * talk to us. But he also says it's ok to leave it out. I suggest we + * delete this whole clause (the one that's #if 0'ed out). I'll leave + * it in place until Nick expresses an opinion. -RD */ if (!(result->ctx = SSL_CTX_new(TLSv1_method()))) goto error; #endif |