[openssl-commits] [openssl] master update

[Viktor Dukhovni]

The branch master has been updated
       via  928623825cc59e272e2031cd3f07c5b7bbd605d4 (commit)
      from  293b5ca47767005e0341b450eef82633f48359f3 (commit)


- Log -----------------------------------------------------------------
commit 928623825cc59e272e2031cd3f07c5b7bbd605d4
Author: Viktor Dukhovni <openssl-users at dukhovni.org>
Date:   Tue Jan 19 12:42:31 2016 -0500

    API compat for SSLeay_add_ssl_algorithms
    
    Reviewed-by: Dr. Stephen Henson <steve at openssl.org>

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

Summary of changes:
 include/openssl/ssl.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 53ee655..3152348 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -1031,6 +1031,9 @@ size_t SSL_get_peer_finished(const SSL *s, void *buf, size_t count);
 # define SSL_VERIFY_CLIENT_ONCE          0x04
 
 # define OpenSSL_add_ssl_algorithms()    SSL_library_init()
+# if OPENSSL_API_COMPAT < 0x10100000L
+#  define SSLeay_add_ssl_algorithms()    SSL_library_init()
+# endif
 
 /* More backward compatibility */
 # define SSL_get_cipher(s) \