[asterisk-commits] lmadsen: trunk r314252 - in /trunk: ./ main/tcptls.c

[SVN commits to the Asterisk project]

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

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

Modified:
    trunk/   (props changed)
    trunk/main/tcptls.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/main/tcptls.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/tcptls.c?view=diff&rev=314252&r1=314251&r2=314252
==============================================================================
--- trunk/main/tcptls.c (original)
+++ trunk/main/tcptls.c Tue Apr 19 10:42:32 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());