From: Viktor Dukhovni <viktor@twosigma.com>
Date: Mon, 7 Mar 2016 21:10:38 +0000 (+0000)
Subject: Retain SSLv2 methods as functions that return NULL
X-Git-Tag: OpenSSL_1_0_1t~30
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5bac9d44e712bc4acfbdd156244fca4486285ec9;p=oweals%2Fopenssl.git

Retain SSLv2 methods as functions that return NULL

This improves ABI compatibility when symbol resolution is not lazy.

Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/ssl/s2_meth.c b/ssl/s2_meth.c
index b312f17266..d46e2f5af8 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