Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

467730 - HTTP2 requires enabled ciphers to be sorted by blacklist 

Fixed removal of COW lists
This commit is contained in:
Greg Wilkins 2015-05-21 02:15:34 +10:00
parent aa8ad7d4f4
commit 61e2177d9e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java
View File

@ -39,6 +39,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
@ -1249,11 +1250,13 @@ public class SslContextFactory extends AbstractLifeCycle
for (String excludeCipherSuite : _excludeCipherSuites)
{
Pattern excludeCipherPattern = Pattern.compile(excludeCipherSuite);
for (String selectedCipherSuite : selected_ciphers)
for (Iterator<String> i=selected_ciphers.iterator();i.hasNext();)
{
String selectedCipherSuite = i.next();
Matcher m = excludeCipherPattern.matcher(selectedCipherSuite);
if (m.matches())
selected_ciphers.remove(selectedCipherSuite);
i.remove();
}
}
}