diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-02-14 12:49:42 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-02-14 12:49:42 -0600 |
| commit | 84a232ffb32d517f25b1603ee749f96efbd8daa4 (patch) | |
| tree | 224ba266137c049dcb99f9ac9e1a403430a4a04b /main | |
| parent | 2f0a036e4b56dfdd67f80b1f1023e2273d73015e (diff) | |
| parent | c6c7f1720608031303418012831f8a644345ad18 (diff) | |
Merge "libasteriskssl: do nothing with OpenSSL >= 1.1"
Diffstat (limited to 'main')
| -rw-r--r-- | main/libasteriskssl.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/main/libasteriskssl.c b/main/libasteriskssl.c index 36982e2be..0ed05e3dc 100644 --- a/main/libasteriskssl.c +++ b/main/libasteriskssl.c @@ -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; } |