diff options
| author | Bodo Möller <bodo@openssl.org> | 2011-02-03 11:43:00 +0100 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2011-02-03 11:43:00 +0100 |
| commit | 88f2a4cf9ced521e2c2874a1c32af0eeaa027f40 (patch) | |
| tree | c47e75369abcbb8f1630033e0cceadce3395c693 /ssl | |
| parent | make update (diff) | |
| download | openssl-88f2a4cf9ced521e2c2874a1c32af0eeaa027f40.tar.xz openssl-88f2a4cf9ced521e2c2874a1c32af0eeaa027f40.zip | |
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 0c1df8ca47..b7287e5b67 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -884,8 +884,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 49751a0048..c41eb8bdfa 100644 --- a/ssl/s3_srvr.c +++ b/ssl/s3_srvr.c @@ -1019,6 +1019,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 @@ -1033,6 +1037,7 @@ int ssl3_get_client_hello(SSL *s) j = 1; } } +#endif if (j == 0) { /* we need to have the cipher in the cipher |