From: Richard Levitte <levitte@openssl.org>
Date: Tue, 14 Nov 2017 04:03:19 +0000 (+0100)
Subject: Don't use SSLv3_client_method internally with no-ssl3
X-Git-Tag: OpenSSL_1_0_2n~9
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=046c5f73535c8a46af940c063e00dfa6cce73f18;p=oweals%2Fopenssl.git

Don't use SSLv3_client_method internally with no-ssl3

Fixes #4734 #4649

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4735)
---

diff --git a/ssl/s23_clnt.c b/ssl/s23_clnt.c
index 05b892b723..add8c9916c 100644
--- a/ssl/s23_clnt.c
+++ b/ssl/s23_clnt.c
@@ -757,7 +757,7 @@ static int ssl23_get_server_hello(SSL *s)
                 s->version = TLS1_VERSION;
                 s->method = TLSv1_client_method();
                 break;
-#ifndef OPENSSL_NO_SSL3_METHOD
+#ifndef OPENSSL_NO_SSL3
             case SSL3_VERSION:
                 s->version = SSL3_VERSION;
                 s->method = SSLv3_client_method();