diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-06-14 14:22:58 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-06-14 14:22:58 -0500 |
| commit | 4ece39f4761ee0d046d37e6096e1edaec0221e34 (patch) | |
| tree | ef4d6bdff430bd9d0ca8a6fadc361d929f4603f4 | |
| parent | e26d15fabbd266b33eff26370d503a9855fad5f7 (diff) | |
| parent | 6a64f65fe6fee96702668bdd3344233f19232850 (diff) | |
Merge "BuildSystem: Add patches to allow building with recent LibreSSL" into 13
| -rw-r--r-- | main/libasteriskssl.c | 4 | ||||
| -rw-r--r-- | main/tcptls.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/main/libasteriskssl.c b/main/libasteriskssl.c index 9dea3df0b..dcb3f88bb 100644 --- a/main/libasteriskssl.c +++ b/main/libasteriskssl.c @@ -74,7 +74,7 @@ static void ssl_lock(int mode, int n, const char *file, int line) } } -#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L +#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) int SSL_library_init(void) { #if defined(AST_DEVMODE) @@ -129,7 +129,7 @@ void ERR_free_strings(void) int ast_ssl_init(void) { #if defined(HAVE_OPENSSL) && defined(OPENSSL_VERSION_NUMBER) && \ - OPENSSL_VERSION_NUMBER < 0x10100000L + (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) unsigned int i; int (*real_SSL_library_init)(void); void (*real_CRYPTO_set_id_callback)(unsigned long (*)(void)); diff --git a/main/tcptls.c b/main/tcptls.c index 7e09e6661..bc2d64bd4 100644 --- a/main/tcptls.c +++ b/main/tcptls.c @@ -447,13 +447,13 @@ static int tcptls_stream_close(void *cookie) ERR_error_string(sslerr, err), ssl_error_to_string(sslerr, res)); } -#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L +#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) if (!SSL_is_server(stream->ssl)) { #else if (!stream->ssl->server) { #endif /* For client threads, ensure that the error stack is cleared */ -#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L +#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) #if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L ERR_remove_thread_state(NULL); #else |