kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-11 20:38:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

libasteriskssl: do nothing with OpenSSL >= 1.1

Browse Source 
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
This commit is contained in:
Tzafrir Cohen
2017-02-03 10:25:33 +02:00
parent e97e50b68b
commit 99b40e72ae
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
main/libasteriskssl.c
View File

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

2
main/tcptls.c
View File

@@ -412,7 +412,7 @@ static int tcptls_stream_close(void *cookie)
#else #else
ERR_remove_state(0); ERR_remove_state(0);
#endif /* openssl == 1.0 */ #endif /* openssl == 1.0 */
#endif /* openssl >= 1.1 */ #endif /* openssl < 1.1 */
} }
SSL_free(stream->ssl); SSL_free(stream->ssl);