[asterisk-commits] lmadsen: branch 1.8 r314251 - /branches/1.8/main/tcptls.c

[SVN commits to the Asterisk project]

Author: lmadsen
Date: Tue Apr 19 10:42:10 2011
New Revision: 314251

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=314251
Log:
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

Modified:
    branches/1.8/main/tcptls.c

Modified: branches/1.8/main/tcptls.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/tcptls.c?view=diff&rev=314251&r1=314250&r2=314251
==============================================================================
--- branches/1.8/main/tcptls.c (original)
+++ branches/1.8/main/tcptls.c Tue Apr 19 10:42:10 2011
@@ -297,9 +297,12 @@
 	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());