Author: markt
Date: Fri Aug 1 19:39:05 2014
New Revision: 1615210
URL: http://svn.apache.org/r1615210
Log:
Restore the required default ciphers after the removal of the system property
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1615210&r1=1615209&r2=1615210&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Fri Aug
1 19:39:05 2014
@@ -49,6 +49,9 @@ import org.apache.tomcat.util.threads.Th
public abstract class AbstractEndpoint<S> {
// -------------------------------------------------------------- Constants
+
+ protected static final String DEFAULT_CIPHERS =
"HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5";
+
protected static final StringManager sm =
StringManager.getManager("org.apache.tomcat.util.net.res");
public static interface Handler {
@@ -919,7 +922,7 @@ public abstract class AbstractEndpoint<S
public String getSslProtocol() { return sslProtocol;}
public void setSslProtocol(String s) { sslProtocol = s;}
- private String ciphers = System.getProperty("tomcat.ssl.ciphers");
+ private String ciphers = DEFAULT_CIPHERS;
public String getCiphers() { return ciphers;}
public void setCiphers(String s) {
ciphers = s;
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1615210&r1=1615209&r2=1615210&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Fri Aug 1
19:39:05 2014
@@ -218,7 +218,7 @@ public class AprEndpoint extends Abstrac
/**
* SSL cipher suite.
*/
- protected String SSLCipherSuite = System.getProperty("tomcat.ssl.ciphers",
"ALL");
+ protected String SSLCipherSuite = DEFAULT_CIPHERS;
public String getSSLCipherSuite() { return SSLCipherSuite; }
public void setSSLCipherSuite(String SSLCipherSuite) { this.SSLCipherSuite
= SSLCipherSuite; }
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
