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 3027617aa040eaf9ac61faa5f8975a81b2893f55..c394191e9e3c5118fcef71986bfd629d5495b3f7 100644 (file)
--- 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
 
 __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
 #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);
 
 /* Negotiate highest available SSL/TLS version */
 __owur const SSL_METHOD *TLS_method(void);