diff options
| author | Leif Madsen <leif@leifmadsen.com> | 2011-04-19 15:42:32 +0000 |
|---|---|---|
| committer | Leif Madsen <leif@leifmadsen.com> | 2011-04-19 15:42:32 +0000 |
| commit | 02821fc5b40192c21d0fb1f68e45481df98879ba (patch) | |
| tree | 16d5029a6e8fe2bad48774d109c3ad245fa946b0 /main/tcptls.c | |
| parent | fd2f95b3c43d762fe1c09fe1edd21fe24ad05a74 (diff) | |
Merged revisions 314251 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r314251 | lmadsen | 2011-04-19 10:42:10 -0500 (Tue, 19 Apr 2011) | 8 lines
Use SSLv23_client_method instead of old SSLv2 only.
(closes issue #19095)
(closes issue #19138)
Reported by: tzafrir
Patches:
no_ssl2.diff uploaded by tzafrir (license 46)
Tested by: russell, chazzam
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@314252 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/tcptls.c')
| -rw-r--r-- | main/tcptls.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/main/tcptls.c b/main/tcptls.c index 4f0f08a96..135f638f5 100644 --- a/main/tcptls.c +++ b/main/tcptls.c @@ -297,9 +297,12 @@ static int __ssl_setup(struct ast_tls_config *cfg, int client) SSLeay_add_ssl_algorithms(); if (client) { +#ifndef OPENSSL_NO_SSL2 if (ast_test_flag(&cfg->flags, AST_SSL_SSLV2_CLIENT)) { cfg->ssl_ctx = SSL_CTX_new(SSLv2_client_method()); - } else if (ast_test_flag(&cfg->flags, AST_SSL_SSLV3_CLIENT)) { + } else +#endif + if (ast_test_flag(&cfg->flags, AST_SSL_SSLV3_CLIENT)) { cfg->ssl_ctx = SSL_CTX_new(SSLv3_client_method()); } else if (ast_test_flag(&cfg->flags, AST_SSL_TLSV1_CLIENT)) { cfg->ssl_ctx = SSL_CTX_new(TLSv1_client_method()); |