diff options
| author | Bodo Möller <bodo@openssl.org> | 2011-02-03 10:43:00 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2011-02-03 10:43:00 +0000 |
| commit | 88f2a4cf9ced521e2c2874a1c32af0eeaa027f40 (patch) | |
| tree | c47e75369abcbb8f1630033e0cceadce3395c693 /ssl/s3_clnt.c | |
| parent | 9d0397e9779524745018d03a8f938905898dfffb (diff) | |
| download | openssl-88f2a4cf9ced521e2c2874a1c32af0eeaa027f40.zip openssl-88f2a4cf9ced521e2c2874a1c32af0eeaa027f40.tar.gz openssl-88f2a4cf9ced521e2c2874a1c32af0eeaa027f40.tar.bz2 | |
CVE-2010-4180 fix (from OpenSSL_1_0_0-stable)
Diffstat (limited to 'ssl/s3_clnt.c')
| -rw-r--r-- | ssl/s3_clnt.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index 0c1df8c..b7287e5 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); |