summaryrefslogtreecommitdiffstats
path: root/lib/libssl/src/ssl/s3_srvr.c
diff options
context:
space:
mode:
authorjasper <jasper@openbsd.org>2010-12-15 09:42:29 +0000
committerjasper <jasper@openbsd.org>2010-12-15 09:42:29 +0000
commit2ce4fda50ded934197068143342d4c23be77341b (patch)
treecbbc62696d8c089fefa1e3da121c4e1c72ae4383 /lib/libssl/src/ssl/s3_srvr.c
parentas of 1989, fread/fwrite take void *, so there's no need to cast to char *. (diff)
downloadwireguard-openbsd-2ce4fda50ded934197068143342d4c23be77341b.tar.xz
wireguard-openbsd-2ce4fda50ded934197068143342d4c23be77341b.zip
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@
Diffstat (limited to 'lib/libssl/src/ssl/s3_srvr.c')
-rw-r--r--lib/libssl/src/ssl/s3_srvr.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/libssl/src/ssl/s3_srvr.c b/lib/libssl/src/ssl/s3_srvr.c
index 92f73b66810..61ee0a3e422 100644
--- a/lib/libssl/src/ssl/s3_srvr.c
+++ b/lib/libssl/src/ssl/s3_srvr.c
@@ -985,6 +985,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
@@ -999,6 +1003,7 @@ int ssl3_get_client_hello(SSL *s)
j = 1;
}
}
+#endif
if (j == 0)
{
/* we need to have the cipher in the cipher