diff options
| author | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2017-02-03 10:25:33 +0200 |
|---|---|---|
| committer | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2017-02-03 10:28:14 +0200 |
| commit | c6c7f1720608031303418012831f8a644345ad18 (patch) | |
| tree | ec050ef44cb82011305e6ff8365d8085ddae5417 /main/libasteriskssl.c | |
| parent | bc041ca14afb6b5c786955a03c331dc45924ca92 (diff) | |
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.
Change-Id: I3b3efd5d80234a4c45a8ee58dcfe25b15d9ad100
Diffstat (limited to 'main/libasteriskssl.c')
| -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; } |