Author: remy.maucherat(a)jboss.com
Date: 2014-12-15 08:55:19 -0500 (Mon, 15 Dec 2014)
New Revision: 2573
Modified:
branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/NioJSSESocketChannelFactory.java
Log:
BZ1172737: Always add SSLv2Hello, following review by JF.
Modified:
branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
===================================================================
---
branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java 2014-12-08
13:50:48 UTC (rev 2572)
+++
branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java 2014-12-15
13:55:19 UTC (rev 2573)
@@ -739,15 +739,13 @@
if (protocols == null) {
return null;
}
- String vmVersion = System.getProperty("java.runtime.version");
- boolean isJava6JVM = (vmVersion != null) &&
vmVersion.startsWith("1.6");
List<String> result = new ArrayList<String>(protocols.length);
for (String protocol : protocols) {
if (protocol == null ||
protocol.toUpperCase(Locale.ENGLISH).contains("SSL")) {
if (CoyoteLogger.UTIL_LOGGER.isDebugEnabled()) {
CoyoteLogger.UTIL_LOGGER.debug("Exclude protocol: " +
protocol);
}
- if (protocol != null && isJava6JVM &&
protocol.equalsIgnoreCase("SSLv2Hello")) {
+ if (protocol != null &&
protocol.equalsIgnoreCase("SSLv2Hello")) {
result.add(protocol);
}
} else {
Modified:
branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/NioJSSESocketChannelFactory.java
===================================================================
---
branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/NioJSSESocketChannelFactory.java 2014-12-08
13:50:48 UTC (rev 2572)
+++
branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/NioJSSESocketChannelFactory.java 2014-12-15
13:55:19 UTC (rev 2573)
@@ -809,6 +809,9 @@
if (CoyoteLogger.UTIL_LOGGER.isDebugEnabled()) {
CoyoteLogger.UTIL_LOGGER.debug("Exclude protocol: " +
protocol);
}
+ if (protocol != null &&
protocol.equalsIgnoreCase("SSLv2Hello")) {
+ result.add(protocol);
+ }
} else {
result.add(protocol);
}
Show replies by date