Provide a simple way of enabling all cipher suites when testing.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@885770 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java b/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
index a6d54e8..cd800a9 100644 (file)
--- a/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
+++ b/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
@@ -92,6 +92,7 @@ public class JSSESocketFactory
         = 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 @@ public class JSSESocketFactory
 
         String[] result = null;
 
+        if (ALLOW_ALL_SUPPORTED_CIPHERS.equals(requestedCiphers)) {
+            return supportedCiphers;
+        }
+
         if (requestedCiphers != null) {
             Vector<String> vec = null;
             String cipher = requestedCiphers;

diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index 5038d3f..6466d93 100644 (file)
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -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">