Author: jfclere
Date: Thu Jul 21 17:48:40 2011
New Revision: 1149279
URL: http://svn.apache.org/viewvc?rev=1149279&view=rev
Log:
Rollback 1149093
Modified:
tomcat/native/branches/1.1.x/native/src/sslcontext.c
Modified: tomcat/native/branches/1.1.x/native/src/sslcontext.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/sslcontext.c?rev=1149279&r1=1149278&r2=1149279&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/sslcontext.c (original)
+++ tomcat/native/branches/1.1.x/native/src/sslcontext.c Thu Jul 21 17:48:40
2011
@@ -91,13 +91,6 @@ TCN_IMPLEMENT_CALL(jlong, SSLContext, ma
case SSL_PROTOCOL_SSLV2 | SSL_PROTOCOL_SSLV3:
case SSL_PROTOCOL_SSLV2 | SSL_PROTOCOL_TLSV1:
case SSL_PROTOCOL_ALL:
- if (mode == SSL_MODE_CLIENT)
- ctx = SSL_CTX_new(SSLv23_client_method());
- else if (mode == SSL_MODE_SERVER)
- ctx = SSL_CTX_new(SSLv23_server_method());
- else
- ctx = SSL_CTX_new(SSLv23_method());
- break;
case SSL_PROTOCOL_SSLV3 | SSL_PROTOCOL_TLSV1:
if (mode == SSL_MODE_CLIENT)
ctx = SSL_CTX_new(SSLv23_client_method());
@@ -105,8 +98,6 @@ TCN_IMPLEMENT_CALL(jlong, SSLContext, ma
ctx = SSL_CTX_new(SSLv23_server_method());
else
ctx = SSL_CTX_new(SSLv23_method());
- if (ctx != NULL)
- SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2);
break;
case SSL_PROTOCOL_TLSV1:
if (mode == SSL_MODE_CLIENT)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
