Merge "libasteriskssl: do nothing with OpenSSL >= 1.1"
This commit is contained in:
commit
84a232ffb3
|
@ -121,10 +121,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));
|
||||
|
@ -189,7 +192,7 @@ int ast_ssl_init(void)
|
|||
|
||||
startup_complete = 1;
|
||||
|
||||
#endif /* HAVE_OPENSSL */
|
||||
#endif /* HAVE_OPENSSL and its version < 1.1 */
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue