From 71f1c5e20456fd247c28ebe306cc4b7295a5b58a Mon Sep 17 00:00:00 2001 From: markt Date: Tue, 1 Dec 2009 14:34:55 +0000 Subject: [PATCH] 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 --- java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java | 5 +++++ webapps/docs/config/http.xml | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java b/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java index a6d54e8dd..cd800a994 100644 --- 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 vec = null; String cipher = requestedCiphers; diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml index 5038d3fd2..6466d9342 100644 --- 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.

+ the JSSE cipher naming convention. The special value of ALL + will enable all supported ciphers. This will include many that are not + secure. ALL is intended for testing purposes only.

-- 2.11.0