[openssl-commits] [openssl] master update

[Viktor Dukhovni]

The branch master has been updated
       via  0dc41520f2af4bf5493879864303c858feac4573 (commit)
      from  5b89036c41a009a76cd0e1595dde5001ae157972 (commit)


- Log -----------------------------------------------------------------
commit 0dc41520f2af4bf5493879864303c858feac4573
Author: Viktor Dukhovni <openssl-users at dukhovni.org>
Date:   Tue Jul 14 21:26:31 2015 -0400

    Maintain backwards-compatible SSLv23_method macros
    
    Reviewed-by: Tim Hudson	<tjh at openssl.org>

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

Summary of changes:
 include/openssl/ssl.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 3027617..c394191 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);