diff options
| author | simon <simon@FreeBSD.org> | 2010-12-03 22:59:54 +0000 |
|---|---|---|
| committer | simon <simon@FreeBSD.org> | 2010-12-03 22:59:54 +0000 |
| commit | 2e755187682578966c1ec502dbfe70c798a908b4 (patch) | |
| tree | 001121d5a23a0b1561ac01281edf7c5f1cb0972a /crypto/openssl/ssl | |
| parent | 477858ee257a6cd5108309ebe5f2cc80ab26c5e1 (diff) | |
| parent | ae03beb758270fb19d741c93f7bfde88a6635612 (diff) | |
| download | FreeBSD-src-2e755187682578966c1ec502dbfe70c798a908b4.zip FreeBSD-src-2e755187682578966c1ec502dbfe70c798a908b4.tar.gz | |
Merge OpenSSL 0.9.8q into head.
Security: CVE-2010-4180
Security: http://www.openssl.org/news/secadv_20101202.txt
MFC after: 3 days
Diffstat (limited to 'crypto/openssl/ssl')
| -rw-r--r-- | crypto/openssl/ssl/s3_clnt.c | 3 | ||||
| -rw-r--r-- | crypto/openssl/ssl/s3_srvr.c | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/crypto/openssl/ssl/s3_clnt.c b/crypto/openssl/ssl/s3_clnt.c index f0995b9..a7cb7a1 100644 --- a/crypto/openssl/ssl/s3_clnt.c +++ b/crypto/openssl/ssl/s3_clnt.c @@ -814,8 +814,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/crypto/openssl/ssl/s3_srvr.c b/crypto/openssl/ssl/s3_srvr.c index e696450..e2d570f 100644 --- a/crypto/openssl/ssl/s3_srvr.c +++ b/crypto/openssl/ssl/s3_srvr.c @@ -927,6 +927,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 @@ -941,6 +945,7 @@ int ssl3_get_client_hello(SSL *s) j = 1; } } +#endif if (j == 0) { /* we need to have the cipher in the cipher |
