Author: markt
Date: Mon Nov 24 11:40:59 2014
New Revision: 1641375
URL: http://svn.apache.org/r1641375
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57234
Make protocol filtering case insensitive
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1641374
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=1641375&r1=1641374&r2=1641375&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Mon Nov 24 11:40:59 2014
@@ -175,7 +175,7 @@ public class JSSESocketFactory implement
// since they are no longer considered secure
List<String> filteredProtocols = new ArrayList<>();
for (String protocol : socket.getEnabledProtocols()) {
- if (protocol.contains("SSL")) {
+ if (protocol.toUpperCase(Locale.ENGLISH).contains("SSL")) {
log.debug(sm.getString("jsse.excludeDefaultProtocol",
protocol));
continue;
}
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1641375&r1=1641374&r2=1641375&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Mon Nov 24 11:40:59 2014
@@ -91,6 +91,10 @@
Allow HTTP upgrade process to complete without data corruption when
additional content is sent along with the upgrade header. (remm)
</fix>
+ <fix>
+ <bug>57234</bug>: Make SSL protocol filtering to remove insecure
+ protoccols case insensitive. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
