1
From 6ce9687b5aba5391fc0de50e18779eb676d0e04d Mon Sep 17 00:00:00 2001
2
From: Kurt Roeckx <kurt@roeckx.be>
3
Date: Tue, 21 Oct 2014 20:45:15 +0200
4
Subject: [PATCH] Keep old method in case of an unsupported protocol
6
Content-Type: text/plain; charset=utf8
7
Content-Transfer-Encoding: 8bit
9
When we're configured with no-ssl3 and we receive an SSL v3 Client Hello, we set
10
the method to NULL. We didn't used to do that, and it breaks things. This is a
11
regression introduced in 62f45cc27d07187b59551e4fad3db4e52ea73f2c. Keep the old
12
method since the code is not able to deal with a NULL method at this time.
14
CVE-2014-3569, PR#3571
16
Reviewed-by: Emilia Käsper <emilia@openssl.org>
17
(cherry picked from commit 392fa7a952e97d82eac6958c81ed1e256e6b8ca5)
19
ssl/s23_srvr.c | 6 ++++--
20
1 file changed, 4 insertions(+), 2 deletions(-)
22
diff --git a/ssl/s23_srvr.c b/ssl/s23_srvr.c
23
index 93ca7d5..de909b1 100644
26
@@ -602,12 +602,14 @@ int ssl23_get_client_hello(SSL *s)
27
if ((type == 2) || (type == 3))
29
/* we have SSLv3/TLSv1 (type 2: SSL2 style, type 3: SSL3/TLS style) */
30
- s->method = ssl23_get_server_method(s->version);
31
- if (s->method == NULL)
32
+ const SSL_METHOD *new_method;
33
+ new_method = ssl23_get_server_method(s->version);
34
+ if (new_method == NULL)
36
SSLerr(SSL_F_SSL23_GET_CLIENT_HELLO,SSL_R_UNSUPPORTED_PROTOCOL);
39
+ s->method = new_method;
41
if (!ssl_init_wbio_buffer(s,1)) goto err;