[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Richard Levitte]

The branch OpenSSL_1_1_0-stable has been updated
       via  a6c1b411d328ce2326fae8cbe64f9dbf8c7f6861 (commit)
      from  ad6edb21e1aa368e2e0d62659f124be67cab52a7 (commit)


- Log -----------------------------------------------------------------
commit a6c1b411d328ce2326fae8cbe64f9dbf8c7f6861
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Jun 25 17:08:20 2018 +0200

    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 at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6588)
    
    (cherry picked from commit 71419442a279a12c2e19a097b5c7e01c29d1fc9c)

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

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

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 70c1603..56e2056 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