100 lines
2.9 KiB
Diff
100 lines
2.9 KiB
Diff
From 26a59d9b46574e457870197dffa802871b4c8fc7 Mon Sep 17 00:00:00 2001
|
|
From: Geoff Thorpe <geoff@openssl.org>
|
|
Date: Wed, 15 Oct 2014 03:25:50 -0400
|
|
Subject: [PATCH] Fix no-ssl3 configuration option
|
|
|
|
CVE-2014-3568
|
|
|
|
Reviewed-by: Emilia Kasper <emilia@openssl.org>
|
|
Reviewed-by: Rich Salz <rsalz@openssl.org>
|
|
Signed-off-by: Catalin Popeanga <catalin.popeanga@enea.com>
|
|
---
|
|
ssl/s23_clnt.c | 9 +++++++--
|
|
ssl/s23_srvr.c | 18 +++++++++---------
|
|
2 files changed, 16 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/ssl/s23_clnt.c b/ssl/s23_clnt.c
|
|
index d4e43c3..86ab3de 100644
|
|
--- a/ssl/s23_clnt.c
|
|
+++ b/ssl/s23_clnt.c
|
|
@@ -125,9 +125,11 @@ static const SSL_METHOD *ssl23_get_client_method(int ver)
|
|
if (ver == SSL2_VERSION)
|
|
return(SSLv2_client_method());
|
|
#endif
|
|
+#ifndef OPENSSL_NO_SSL3
|
|
if (ver == SSL3_VERSION)
|
|
return(SSLv3_client_method());
|
|
- else if (ver == TLS1_VERSION)
|
|
+#endif
|
|
+ if (ver == TLS1_VERSION)
|
|
return(TLSv1_client_method());
|
|
else if (ver == TLS1_1_VERSION)
|
|
return(TLSv1_1_client_method());
|
|
@@ -698,6 +700,7 @@ static int ssl23_get_server_hello(SSL *s)
|
|
{
|
|
/* we have sslv3 or tls1 (server hello or alert) */
|
|
|
|
+#ifndef OPENSSL_NO_SSL3
|
|
if ((p[2] == SSL3_VERSION_MINOR) &&
|
|
!(s->options & SSL_OP_NO_SSLv3))
|
|
{
|
|
@@ -712,7 +715,9 @@ static int ssl23_get_server_hello(SSL *s)
|
|
s->version=SSL3_VERSION;
|
|
s->method=SSLv3_client_method();
|
|
}
|
|
- else if ((p[2] == TLS1_VERSION_MINOR) &&
|
|
+ else
|
|
+#endif
|
|
+ if ((p[2] == TLS1_VERSION_MINOR) &&
|
|
!(s->options & SSL_OP_NO_TLSv1))
|
|
{
|
|
s->version=TLS1_VERSION;
|
|
diff --git a/ssl/s23_srvr.c b/ssl/s23_srvr.c
|
|
index 567a6b1..93ca7d5 100644
|
|
--- a/ssl/s23_srvr.c
|
|
+++ b/ssl/s23_srvr.c
|
|
@@ -127,9 +127,11 @@ static const SSL_METHOD *ssl23_get_server_method(int ver)
|
|
if (ver == SSL2_VERSION)
|
|
return(SSLv2_server_method());
|
|
#endif
|
|
+#ifndef OPENSSL_NO_SSL3
|
|
if (ver == SSL3_VERSION)
|
|
return(SSLv3_server_method());
|
|
- else if (ver == TLS1_VERSION)
|
|
+#endif
|
|
+ if (ver == TLS1_VERSION)
|
|
return(TLSv1_server_method());
|
|
else if (ver == TLS1_1_VERSION)
|
|
return(TLSv1_1_server_method());
|
|
@@ -600,6 +602,12 @@ int ssl23_get_client_hello(SSL *s)
|
|
if ((type == 2) || (type == 3))
|
|
{
|
|
/* we have SSLv3/TLSv1 (type 2: SSL2 style, type 3: SSL3/TLS style) */
|
|
+ s->method = ssl23_get_server_method(s->version);
|
|
+ if (s->method == NULL)
|
|
+ {
|
|
+ SSLerr(SSL_F_SSL23_GET_CLIENT_HELLO,SSL_R_UNSUPPORTED_PROTOCOL);
|
|
+ goto err;
|
|
+ }
|
|
|
|
if (!ssl_init_wbio_buffer(s,1)) goto err;
|
|
|
|
@@ -627,14 +635,6 @@ int ssl23_get_client_hello(SSL *s)
|
|
s->s3->rbuf.left=0;
|
|
s->s3->rbuf.offset=0;
|
|
}
|
|
- if (s->version == TLS1_2_VERSION)
|
|
- s->method = TLSv1_2_server_method();
|
|
- else if (s->version == TLS1_1_VERSION)
|
|
- s->method = TLSv1_1_server_method();
|
|
- else if (s->version == TLS1_VERSION)
|
|
- s->method = TLSv1_server_method();
|
|
- else
|
|
- s->method = SSLv3_server_method();
|
|
#if 0 /* ssl3_get_client_hello does this */
|
|
s->client_version=(v[0]<<8)|v[1];
|
|
#endif
|
|
--
|
|
1.7.9.5
|
|
|