Author: markt
Date: Mon May 11 13:59:35 2015
New Revision: 1678756
URL: http://svn.apache.org/r1678756
Log:
Support SSLv2Hello by default.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
tomcat/trunk/webapps/docs/config/http.xml
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java?rev=1678756&r1=1678755&r2=1678756&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java Mon May 11
13:59:35 2015
@@ -239,6 +239,7 @@ public class SSLHostConfig {
String trimmed = value.trim();
if (trimmed.length() > 0) {
if (input.trim().equalsIgnoreCase("all")) {
+ protocols.add("SSLv2Hello");
protocols.add("TLSv1");
protocols.add("TLSv1.1");
protocols.add("TLSv1.2");
Modified: tomcat/trunk/webapps/docs/config/http.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1678756&r1=1678755&r2=1678756&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/trunk/webapps/docs/config/http.xml Mon May 11 13:59:35 2015
@@ -1230,7 +1230,7 @@
single protocol is specified it will not support
<code>SSLv2Hello</code>.</p>
<p>Note that <code>all</code> is an alias for
- <code>TLSv1,TLSv1.1,TLSv1.2</code>.</p>
+ <code>SSLv2Hello,TLSv1,TLSv1.1,TLSv1.2</code>.</p>
<p>Note that <code>SSLv2</code> and <code>SSLv3</code> are inherently
unsafe.</p>
<p>If not specified, the default value of <code>all</code> will be
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
