kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 16:21:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "libasteriskssl: do nothing with OpenSSL >= 1.1"

Browse Source
This commit is contained in:
Joshua Colp
2017-02-14 12:49:42 -06:00
committed by Gerrit Code Review
parent 2f0a036e4b c6c7f17206
commit 84a232ffb3
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
main/libasteriskssl.c
View File

@@ -121,10 +121,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));
@@ -189,7 +192,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;
} }