Security fix for CVE-2010-4180 as mentioned in http://www.openssl.org/news/secadv_20101202.txt.

where clients could modify the stored session
cache ciphersuite and in some cases even downgrade the suite to weaker ones.

This code is not enabled by default.

ok djm@

1 files changed, 3 insertions, 0 deletions

diff --git a/src/lib/libssl/s3_clnt.c b/src/lib/libssl/s3_clnt.c
index 41769febab..8cc291b922 100644
--- a/src/lib/libssl/s3_clnt.c
+++ b/src/lib/libssl/s3_clnt.c
@@ -866,8 +866,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);