[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Richard Levitte]

The branch OpenSSL_1_0_2-stable has been updated
       via  046c5f73535c8a46af940c063e00dfa6cce73f18 (commit)
      from  b2921cf7f2468ecf9932527070cd30b3f5cbb467 (commit)


- Log -----------------------------------------------------------------
commit 046c5f73535c8a46af940c063e00dfa6cce73f18
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Nov 14 05:03:19 2017 +0100

    Don't use SSLv3_client_method internally with no-ssl3
    
    Fixes #4734 #4649
    
    Reviewed-by: Viktor Dukhovni <viktor at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4735)

-----------------------------------------------------------------------

Summary of changes:
 ssl/s23_clnt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ssl/s23_clnt.c b/ssl/s23_clnt.c
index 05b892b..add8c99 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();