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

[Viktor Dukhovni]

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


- Log -----------------------------------------------------------------
commit 5bac9d44e712bc4acfbdd156244fca4486285ec9
Author: Viktor Dukhovni <viktor at twosigma.com>
Date:   Mon Mar 7 21:10:38 2016 +0000

    Retain SSLv2 methods as functions that return NULL
    
    This improves ABI compatibility when symbol resolution is not lazy.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 ssl/s2_meth.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ssl/s2_meth.c b/ssl/s2_meth.c
index b312f17..d46e2f5 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 */
 
-# if PEDANTIC
-static void *dummy = &dummy;
-# endif
+SSL_METHOD *SSLv2_method(void) { return NULL; }
+SSL_METHOD *SSLv2_client_method(void) { return NULL; }
+SSL_METHOD *SSLv2_server_method(void) { return NULL; }
 
 #endif