kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-14 08:31:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "tcptls: use TLS_client_method with OpenSSL 1.1"

Browse Source
This commit is contained in:
zuul
2017-02-14 12:41:06 -06:00
committed by Gerrit Code Review
parent d4f512e7d9 bc041ca14a
commit 2f0a036e4b
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/tcptls.c
View File

@@ -324,12 +324,16 @@ static int __ssl_setup(struct ast_tls_config *cfg, int client)
cfg->ssl_ctx = SSL_CTX_new(SSLv3_client_method()); cfg->ssl_ctx = SSL_CTX_new(SSLv3_client_method());
} else } else
#endif #endif
#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L)
cfg->ssl_ctx = SSL_CTX_new(TLS_client_method());
#else
if (ast_test_flag(&cfg->flags, AST_SSL_TLSV1_CLIENT)) { if (ast_test_flag(&cfg->flags, AST_SSL_TLSV1_CLIENT)) {
cfg->ssl_ctx = SSL_CTX_new(TLSv1_client_method()); cfg->ssl_ctx = SSL_CTX_new(TLSv1_client_method());
} else { } else {
disable_ssl = 1; disable_ssl = 1;
cfg->ssl_ctx = SSL_CTX_new(SSLv23_client_method()); cfg->ssl_ctx = SSL_CTX_new(SSLv23_client_method());
} }
#endif
} else { } else {
disable_ssl = 1; disable_ssl = 1;
cfg->ssl_ctx = SSL_CTX_new(SSLv23_server_method()); cfg->ssl_ctx = SSL_CTX_new(SSLv23_server_method());