From: Viktor Dukhovni <openssl-users@dukhovni.org>
Date: Wed, 15 Jul 2015 01:26:31 +0000 (-0400)
Subject: Maintain backwards-compatible SSLv23_method macros
X-Git-Tag: OpenSSL_1_1_0-pre1~920
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0dc41520f2af4bf5493879864303c858feac4573;p=oweals%2Fopenssl.git

Maintain backwards-compatible SSLv23_method macros

Reviewed-by: Tim Hudson	<tjh@openssl.org>
---

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 3027617aa0..c394191e9e 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -1546,11 +1546,9 @@ __owur const SSL_METHOD *SSLv3_server_method(void); /* SSLv3 */
 __owur const SSL_METHOD *SSLv3_client_method(void); /* SSLv3 */
 # endif
 
-#ifdef OPENSSL_USE_DEPRECATED
 #define SSLv23_method           TLS_method
 #define SSLv23_server_method    TLS_server_method
 #define SSLv23_client_method    TLS_client_method
-#endif
 
 /* Negotiate highest available SSL/TLS version */
 __owur const SSL_METHOD *TLS_method(void);