From: Richard Levitte <levitte@openssl.org>
Date: Mon, 25 Jun 2018 15:08:20 +0000 (+0200)
Subject: OpenSSL_add_ssl_algorithm-is-deprecated() is deprecated, make it so
X-Git-Tag: OpenSSL_1_1_0i~67
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a6c1b411d328ce2326fae8cbe64f9dbf8c7f6861;p=oweals%2Fopenssl.git

OpenSSL_add_ssl_algorithm-is-deprecated() is deprecated, make it so

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)

(cherry picked from commit 71419442a279a12c2e19a097b5c7e01c29d1fc9c)
---

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 70c1603e8e..56e2056260 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -967,8 +967,8 @@ size_t SSL_get_peer_finished(const SSL *s, void *buf, size_t count);
 # define SSL_VERIFY_FAIL_IF_NO_PEER_CERT 0x02
 # define SSL_VERIFY_CLIENT_ONCE          0x04
 
-# 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