kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-12 21:09:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "BuildSystem: Add patches to allow building with recent LibreSSL" into 13

Browse Source
This commit is contained in:
Joshua Colp
2017-06-14 14:22:58 -05:00
committed by Gerrit Code Review
parent e26d15fabb 6a64f65fe6
commit 4ece39f476
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/libasteriskssl.c
View File

@@ -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) int SSL_library_init(void)
{ {
#if defined(AST_DEVMODE) #if defined(AST_DEVMODE)
@@ -129,7 +129,7 @@ void ERR_free_strings(void)
int ast_ssl_init(void) int ast_ssl_init(void)
{ {
#if defined(HAVE_OPENSSL) && defined(OPENSSL_VERSION_NUMBER) && \ #if defined(HAVE_OPENSSL) && defined(OPENSSL_VERSION_NUMBER) && \
OPENSSL_VERSION_NUMBER < 0x10100000L (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
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));

4
main/tcptls.c
View File

@@ -447,13 +447,13 @@ static int tcptls_stream_close(void *cookie)
ERR_error_string(sslerr, err), ssl_error_to_string(sslerr, res)); 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)) { if (!SSL_is_server(stream->ssl)) {
#else #else
if (!stream->ssl->server) { if (!stream->ssl->server) {
#endif #endif
/* For client threads, ensure that the error stack is cleared */ /* 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 #if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L
ERR_remove_thread_state(NULL); ERR_remove_thread_state(NULL);
#else #else