diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-02-10 10:56:37 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-02-10 10:56:37 -0500 |
| commit | 8855b2a90c8b3314ac9aa804ec2802e9d4c50617 (patch) | |
| tree | e9039046fa6750d592f488a9ffc37de0317b6750 | |
| parent | ef0bc7f8f26a917c89ca947a2b432b57cd5e06b5 (diff) | |
| parent | 2da0efb547b70a7caed59097036d1e59859a4b35 (diff) | |
| download | tor-8855b2a90c8b3314ac9aa804ec2802e9d4c50617.tar.gz tor-8855b2a90c8b3314ac9aa804ec2802e9d4c50617.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/common/tortls.c
Conflict on comment near use of the new OPENSSL_V macro
| -rw-r--r-- | src/common/tortls.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/common/tortls.c b/src/common/tortls.c index 26d37145a3..cffba2e6ce 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -83,7 +83,7 @@ (OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(0,9,9) && \ OPENSSL_VERSION_NUMBER < OPENSSL_V(1,0,0,'f'))) /* This is a version of OpenSSL before 0.9.8s/1.0.0f. It does not have - * the CVE-2011-4657 fix, and as such it can't use RELEASE_BUFFERS and + * the CVE-2011-4576 fix, and as such it can't use RELEASE_BUFFERS and * SSL3 safely at the same time. */ #define DISABLE_SSL3_HANDSHAKE @@ -1182,9 +1182,9 @@ tor_tls_context_new(crypto_pk_t *identity, unsigned int key_lifetime, SSLeay() < OPENSSL_V(0,9,8,'s') || (SSLeay() >= OPENSSL_V_SERIES(0,9,9) && SSLeay() < OPENSSL_V(1,0,0,'f'))) { - /* And not SSL3 if it's subject to CVE-2011-4657. */ + /* And not SSL3 if it's subject to CVE-2011-4576. */ log_info(LD_NET, "Disabling SSLv3 because this OpenSSL version " - "might otherwise be vulnerable to CVE-2011-4657 " + "might otherwise be vulnerable to CVE-2011-4576 " "(compile-time version %08lx (%s); " "runtime version %08lx (%s))", (unsigned long)OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT, |