OpenSSL_add_ssl_algorithm-is-deprecated() is deprecated, make it so
authorRichard Levitte <levitte@openssl.org>
Mon, 25 Jun 2018 15:08:20 +0000 (17:08 +0200)
committerRichard Levitte <levitte@openssl.org>
Mon, 25 Jun 2018 15:10:02 +0000 (17:10 +0200)
This function is documented to be deprecated since OpenSSL 1.1.0.  We
need to make it so in openssl/ssl.h as well.

Fixes #6565

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6588)

include/openssl/ssl.h

index 280250ad835f4a3743b899379ca0aa52f0b5b31a..943a8d6c9fd78674839f7ac9da514fc1e5251455 100644 (file)
@@ -1079,8 +1079,8 @@ size_t SSL_get_peer_finished(const SSL *s, void *buf, size_t count);
 # define SSL_VERIFY_CLIENT_ONCE          0x04
 # define SSL_VERIFY_POST_HANDSHAKE       0x08
 
-# define OpenSSL_add_ssl_algorithms()    SSL_library_init()
 # if OPENSSL_API_COMPAT < 0x10100000L
+#  define OpenSSL_add_ssl_algorithms()   SSL_library_init()
 #  define SSLeay_add_ssl_algorithms()    SSL_library_init()
 # endif