libasteriskssl: do nothing with OpenSSL >= 1.1

OpenSSL 1.1 requires no explicit initialization. The hacks in the
library are not needed. They also happen to fail running Asterisk.

ASTERISK-26109 #close

Change-Id: I3b3efd5d80234a4c45a8ee58dcfe25b15d9ad100

diff --git a/main/libasteriskssl.c b/main/libasteriskssl.c
index 33fcf4f2e70f72fabb07c11ad0920265a90da118..df4591922641b7b6bfa88ac833cc5acfcf6c5e36 100644 (file)
--- a/main/libasteriskssl.c
+++ b/main/libasteriskssl.c
@@ -123,10 +123,13 @@ void ERR_free_strings(void)
 /*!
  * \internal
  * \brief Common OpenSSL initialization for all of Asterisk.
+ *
+ * Not needed for OpenSSL versions >= 1.1.0
  */
 int ast_ssl_init(void)
 {
-#ifdef HAVE_OPENSSL
+#if defined(HAVE_OPENSSL) && defined(OPENSSL_VERSION_NUMBER) && \
+       OPENSSL_VERSION_NUMBER < 0x10100000L
        unsigned int i;
        int (*real_SSL_library_init)(void);
        void (*real_CRYPTO_set_id_callback)(unsigned long (*)(void));
@@ -191,7 +194,7 @@ int ast_ssl_init(void)
 
        startup_complete = 1;
 
-#endif /* HAVE_OPENSSL */
+#endif /* HAVE_OPENSSL and its version < 1.1 */
        return 0;
 }