kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-03 19:16:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "OpenSSL 1.1.0 support" into 13

Browse Source
This commit is contained in:
Joshua Colp
2016-12-01 05:08:52 -06:00
committed by Gerrit Code Review
parent eec82c6221 b0c9f07f04
commit 662a4741e2
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/libasteriskssl.c
View File

@@ -67,13 +67,14 @@ static void ssl_lock(int mode, int n, const char *file, int line)
return; return;
} }
if (mode & CRYPTO_LOCK) { if (mode & 0x1) {
ast_mutex_lock(&ssl_locks[n]); ast_mutex_lock(&ssl_locks[n]);
} else { } else {
ast_mutex_unlock(&ssl_locks[n]); ast_mutex_unlock(&ssl_locks[n]);
} }
} }
#if !defined(OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < 0x10100000L
int SSL_library_init(void) int SSL_library_init(void)
{ {
#if defined(AST_DEVMODE) #if defined(AST_DEVMODE)
@@ -115,6 +116,7 @@ void ERR_free_strings(void)
{ {
/* we can't allow this to be called, ever */ /* we can't allow this to be called, ever */
} }
#endif /* !defined(OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < 0x10100000L */
#endif /* HAVE_OPENSSL */ #endif /* HAVE_OPENSSL */

8
main/tcptls.c
View File

@@ -398,13 +398,19 @@ static int tcptls_stream_close(void *cookie)
SSL_get_error(stream->ssl, res)); SSL_get_error(stream->ssl, res));
} }
#if defined(OPENSSL_API_COMPAT) && OPENSSL_API_COMPAT >= 0x10100000L
if (!SSL_is_server(stream->ssl)) {
#else
if (!stream->ssl->server) { if (!stream->ssl->server) {
#endif
/* For client threads, ensure that the error stack is cleared */ /* For client threads, ensure that the error stack is cleared */
#if !defined(OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < 0x10100000L
#if OPENSSL_VERSION_NUMBER >= 0x10000000L #if OPENSSL_VERSION_NUMBER >= 0x10000000L
ERR_remove_thread_state(NULL); ERR_remove_thread_state(NULL);
#else #else
ERR_remove_state(0); ERR_remove_state(0);
#endif /* OPENSSL_VERSION_NUMBER >= 0x10000000L */ #endif /* OPENSSL_VERSION_NUMBER >= 0x10000000L */
#endif /* !defined(OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < 0x10100000L */
} }
SSL_free(stream->ssl); SSL_free(stream->ssl);
@@ -813,7 +819,7 @@ static int __ssl_setup(struct ast_tls_config *cfg, int client)
} }
if (client) { if (client) {
#ifndef OPENSSL_NO_SSL2 #if !defined(OPENSSL_NO_SSL2) && (OPENSSL_VERSION_NUMBER < 0x10100000L)
if (ast_test_flag(&cfg->flags, AST_SSL_SSLV2_CLIENT)) { if (ast_test_flag(&cfg->flags, AST_SSL_SSLV2_CLIENT)) {
ast_log(LOG_WARNING, "Usage of SSLv2 is discouraged due to known vulnerabilities. Please use 'tlsv1' or leave the TLS method unspecified!\n"); ast_log(LOG_WARNING, "Usage of SSLv2 is discouraged due to known vulnerabilities. Please use 'tlsv1' or leave the TLS method unspecified!\n");
cfg->ssl_ctx = SSL_CTX_new(SSLv2_client_method()); cfg->ssl_ctx = SSL_CTX_new(SSLv2_client_method());