tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r885770 - in /tomcat/trunk: java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java webapps/docs/config/http.xml
Date Tue, 01 Dec 2009 14:34:55 GMT
Author: markt
Date: Tue Dec  1 14:34:55 2009
New Revision: 885770

URL: http://svn.apache.org/viewvc?rev=885770&view=rev
Log:
Provide a simple way of enabling all cipher suites when testing.

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
    tomcat/trunk/webapps/docs/config/http.xml

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=885770&r1=885769&r2=885770&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java Tue Dec  1 14:34:55
2009
@@ -92,6 +92,7 @@
         = System.getProperty("user.home") + "/.keystore";
     private static final int defaultSessionCacheSize = 0;
     private static final int defaultSessionTimeout = 86400;
+    private static final String ALLOW_ALL_SUPPORTED_CIPHERS = "ALL";
     public static final String DEFAULT_KEY_PASS = "changeit";
     
     static final org.apache.juli.logging.Log log =
@@ -190,6 +191,10 @@
 
         String[] result = null;
 
+        if (ALLOW_ALL_SUPPORTED_CIPHERS.equals(requestedCiphers)) {
+            return supportedCiphers;
+        }
+
         if (requestedCiphers != null) {
             Vector<String> vec = null;
             String cipher = requestedCiphers;

Modified: tomcat/trunk/webapps/docs/config/http.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=885770&r1=885769&r2=885770&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/trunk/webapps/docs/config/http.xml Tue Dec  1 14:34:55 2009
@@ -742,7 +742,9 @@
       allowed to use. By default, the default ciphers for the JVM will be used.
       Note that this usually means that the weak export grade ciphers will be
       included in the list of available ciphers. The ciphers are specified using
-      the JSSE cipher naming convention.</p>
+      the JSSE cipher naming convention. The special value of <code>ALL</code>
+      will enable all supported ciphers. This will include many that are not
+      secure. <code>ALL</code> is intended for testing purposes only.</p>
     </attribute>
 
     <attribute name="keyAlias" required="false">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message