Skip to content
Snippets Groups Projects
Commit 2f0a036e authored by zuul's avatar zuul Committed by Gerrit Code Review
Browse files

Merge "tcptls: use TLS_client_method with OpenSSL 1.1"

parents d4f512e7 bc041ca1
Branches
Tags
No related merge requests found
...@@ -324,12 +324,16 @@ static int __ssl_setup(struct ast_tls_config *cfg, int client) ...@@ -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());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment