diff options
| author | zuul <zuul@gerrit.asterisk.org> | 2017-02-15 08:43:45 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-02-15 08:43:45 -0600 |
| commit | 07163005adaa02ffcd9277f7480b1ff2e148d750 (patch) | |
| tree | ee687f08868dfa8ef586f0ab7e573255f3da658f | |
| parent | 258b808dceddb9e42c9542d720dd670cdfbde351 (diff) | |
| parent | e97e50b68b0497f906a73a1acc26c3a97d9c9d7f (diff) | |
Merge "tcptls: use TLS_client_method with OpenSSL 1.1" into 13
| -rw-r--r-- | main/tcptls.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/main/tcptls.c b/main/tcptls.c index 71bd92eb6..36a6c9659 100644 --- a/main/tcptls.c +++ b/main/tcptls.c @@ -833,12 +833,16 @@ static int __ssl_setup(struct ast_tls_config *cfg, int client) cfg->ssl_ctx = SSL_CTX_new(SSLv3_client_method()); } else #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)) { cfg->ssl_ctx = SSL_CTX_new(TLSv1_client_method()); } else { disable_ssl = 1; cfg->ssl_ctx = SSL_CTX_new(SSLv23_client_method()); } +#endif } else { disable_ssl = 1; cfg->ssl_ctx = SSL_CTX_new(SSLv23_server_method()); |