diff options
author | Bodo Möller <bodo@openssl.org> | 2011-02-03 10:42:00 +0000 |
---|---|---|
committer | Bodo Möller <bodo@openssl.org> | 2011-02-03 10:42:00 +0000 |
commit | 346601bc3255c6728785fedfe27d9f923a33afaf (patch) | |
tree | 902650103f61a6993821f3a9084cd20c1479d157 /ssl | |
parent | 5080fbbef024e8dca56f2ce94cef0c37a2bf3bcb (diff) | |
download | openssl-346601bc3255c6728785fedfe27d9f923a33afaf.tar.gz |
CVE-2010-4180 fix (from OpenSSL_1_0_0-stable)
Diffstat (limited to 'ssl')
-rw-r--r-- | ssl/s3_clnt.c | 3 | ||||
-rw-r--r-- | ssl/s3_srvr.c | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index 8b74e9f53e..bf59d798f8 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -867,8 +867,11 @@ int ssl3_get_server_hello(SSL *s) s->session->cipher_id = s->session->cipher->id; if (s->hit && (s->session->cipher_id != c->id)) { +/* Workaround is now obsolete */ +#if 0 if (!(s->options & SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG)) +#endif { al=SSL_AD_ILLEGAL_PARAMETER; SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED); diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c index b1071da262..1b99a946a7 100644 --- a/ssl/s3_srvr.c +++ b/ssl/s3_srvr.c @@ -986,6 +986,10 @@ int ssl3_get_client_hello(SSL *s) break; } } +/* Disabled because it can be used in a ciphersuite downgrade + * attack: CVE-2010-4180. + */ +#if 0 if (j == 0 && (s->options & SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG) && (sk_SSL_CIPHER_num(ciphers) == 1)) { /* Special case as client bug workaround: the previously used cipher may @@ -1000,6 +1004,7 @@ int ssl3_get_client_hello(SSL *s) j = 1; } } +#endif if (j == 0) { /* we need to have the cipher in the cipher |