Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2015-04-09 00:31:45 +0000
committerGreg Wilkins2015-04-09 00:31:45 +0000
commit663ff827ed039b3822790ea0503dfde7ca9bf1d9 (patch)
treebd49cb1817384d7ad5de8ccf2ea4839d5d76208a
parent60d790cbf8015c6cf98743606fdffed3f77dd463 (diff)
downloadorg.eclipse.jetty.project-663ff827ed039b3822790ea0503dfde7ca9bf1d9.tar.gz
org.eclipse.jetty.project-663ff827ed039b3822790ea0503dfde7ca9bf1d9.tar.xz
org.eclipse.jetty.project-663ff827ed039b3822790ea0503dfde7ca9bf1d9.zip
Blacklist ciphers only for h2-16 and later
-rw-r--r--jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerConnectionFactory.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerConnectionFactory.java b/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerConnectionFactory.java
index 6065219ef6..147a706625 100644
--- a/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerConnectionFactory.java
+++ b/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerConnectionFactory.java
@@ -64,8 +64,12 @@ public class HTTP2ServerConnectionFactory extends AbstractHTTP2ServerConnectionF
@Override
public boolean isAcceptable(String protocol, String tlsProtocol, String tlsCipher)
{
+ // TODO remove this draft protection
+ if ("h2-14".equals(protocol))
+ return true;
+
// Implement 9.2.2
- return !HTTP2Cipher.isBlackListProtocol(tlsProtocol) || !HTTP2Cipher.isBlackListCipher(tlsCipher);
+ return !(HTTP2Cipher.isBlackListProtocol(tlsProtocol) && HTTP2Cipher.isBlackListCipher(tlsCipher));
}
public class HTTPServerSessionListener extends ServerSessionListener.Adapter implements Stream.Listener

Back to the top