svn commit: r386819 - in /tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/jsse: JSSE13SocketFactory.java JSSE14SocketFactory.java JSSESocketFactory.java

[billbarker]

Author: billbarker
Date: Fri Mar 17 23:26:00 2006
New Revision: 386819

URL: http://svn.apache.org/viewcvs?rev=386819&view=rev
Log:
Restoring ability to configure non-default ciphers

Modified:
    
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java
    
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/jsse/JSSE14SocketFactory.java
    
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java

Modified: 
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java
URL: 
http://svn.apache.org/viewcvs/tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java?rev=386819&r1=386818&r2=386819&view=diff
==============================================================================
--- 
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java
 (original)
+++ 
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java
 Fri Mar 17 23:26:00 2006
@@ -126,7 +126,7 @@
             // Determine which cipher suites to enable
             String requestedCiphers = (String)attributes.get("ciphers");
             enabledCiphers = getEnabledCiphers(requestedCiphers,
-                     sslProxy.getDefaultCipherSuites());
+                     sslProxy.getSupportedCipherSuites());
 
         } catch(Exception e) {
             if( e instanceof IOException )

Modified: 
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/jsse/JSSE14SocketFactory.java
URL: 
http://svn.apache.org/viewcvs/tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/jsse/JSSE14SocketFactory.java?rev=386819&r1=386818&r2=386819&view=diff
==============================================================================
--- 
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/jsse/JSSE14SocketFactory.java
 (original)
+++ 
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/jsse/JSSE14SocketFactory.java
 Fri Mar 17 23:26:00 2006
@@ -117,7 +117,7 @@
             // Determine which cipher suites to enable
             String requestedCiphers = (String)attributes.get("ciphers");
             enabledCiphers = getEnabledCiphers(requestedCiphers,
-                                               
sslProxy.getDefaultCipherSuites());
+                                               
sslProxy.getSupportedCipherSuites());
 
         } catch(Exception e) {
             if( e instanceof IOException )

Modified: 
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL: 
http://svn.apache.org/viewcvs/tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=386819&r1=386818&r2=386819&view=diff
==============================================================================
--- 
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
 (original)
+++ 
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
 Fri Mar 17 23:26:00 2006
@@ -188,7 +188,7 @@
                 vec.copyInto(enabledCiphers);
             }
         } else {
-            enabledCiphers = supportedCiphers;
+            enabledCiphers = sslProxy.getDefaultCipherSuites();
         }
 
         return enabledCiphers;



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]