[openssl-commits] [openssl] OpenSSL_1_0_1-stable update

[Viktor Dukhovni]

The branch OpenSSL_1_0_1-stable has been updated
       via  03c71b84d351a3a5de0bc7d39a99336369277849 (commit)
      from  5bac9d44e712bc4acfbdd156244fca4486285ec9 (commit)


- Log -----------------------------------------------------------------
commit 03c71b84d351a3a5de0bc7d39a99336369277849
Author: Viktor Dukhovni <openssl-users at dukhovni.org>
Date:   Tue Mar 8 15:30:27 2016 -0500

    expose SSLv2 method prototypes
    
    Reviewed-by: Kurt Roeckx <kurt at openssl.org>

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

Summary of changes:
 ssl/s2_meth.c | 6 +++---
 ssl/ssl.h     | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ssl/s2_meth.c b/ssl/s2_meth.c
index d46e2f5..019d9dc 100644
--- a/ssl/s2_meth.c
+++ b/ssl/s2_meth.c
@@ -74,8 +74,8 @@ IMPLEMENT_ssl2_meth_func(SSLv2_method,
                          ssl2_accept, ssl2_connect, ssl2_get_method)
 #else                           /* !OPENSSL_NO_SSL2 */
 
-SSL_METHOD *SSLv2_method(void) { return NULL; }
-SSL_METHOD *SSLv2_client_method(void) { return NULL; }
-SSL_METHOD *SSLv2_server_method(void) { return NULL; }
+const SSL_METHOD *SSLv2_method(void) { return NULL; }
+const SSL_METHOD *SSLv2_client_method(void) { return NULL; }
+const SSL_METHOD *SSLv2_server_method(void) { return NULL; }
 
 #endif
diff --git a/ssl/ssl.h b/ssl/ssl.h
index ee7b114..06eb661 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -2017,11 +2017,9 @@ const char *SSL_get_version(const SSL *s);
 /* This sets the 'default' SSL version that SSL_new() will create */
 int SSL_CTX_set_ssl_version(SSL_CTX *ctx, const SSL_METHOD *meth);
 
-# ifndef OPENSSL_NO_SSL2
 const SSL_METHOD *SSLv2_method(void); /* SSLv2 */
 const SSL_METHOD *SSLv2_server_method(void); /* SSLv2 */
 const SSL_METHOD *SSLv2_client_method(void); /* SSLv2 */
-# endif
 
 # ifndef OPENSSL_NO_SSL3_METHOD
 const SSL_METHOD *SSLv3_method(void); /* SSLv3 */