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

Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x

This commit is contained in:
gregw 2020-11-25 23:03:00 +01:00
parent bd5b612508 7646a24828
commit a1c62a9a84
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Cipher.java
View File

@ -30,8 +30,6 @@ public class HTTP2Cipher
private static final Trie<Boolean> __blackProtocols = new ArrayTrie<>(6 * 5);
private static final Trie<Boolean> __blackCiphers = new ArrayTrie<>(275 * 40);
static String[] _xxx;
static
{
String[] protocols = {"TLSv1.2", "TLSv1.1", "TLSv1", "SSL", "SSLv2", "SSLv3"};
@ -43,9 +41,9 @@ public class HTTP2Cipher
String[] ciphers =
{
"TLS_NULL_WITH_NULL_NULL",
// "TLS_RSA_WITH_NULL_MD5",
"TLS_RSA_WITH_NULL_MD5",
"TLS_RSA_WITH_NULL_SHA",
"TLS_RSA_EXPORT_WITH_RC4_40_MD5"/*,
"TLS_RSA_EXPORT_WITH_RC4_40_MD5",
"TLS_RSA_WITH_RC4_128_MD5",
"TLS_RSA_WITH_RC4_128_SHA",
"TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5",
@ -318,9 +316,7 @@ public class HTTP2Cipher
"TLS_PSK_WITH_AES_256_CCM",
"TLS_PSK_WITH_AES_128_CCM_8",
"TLS_PSK_WITH_AES_256_CCM_8"
*/
};
_xxx = ciphers;
for (String c : ciphers)
{
__blackCiphers.put(c, Boolean.TRUE);