archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8217579: TLS_EMPTY_RENEGOTIATION_INFO_SCSV is disabled after 8211883

Browse source 
Reviewed-by: jnimeh, clanger
This commit is contained in:
Sean Mullan 2019-01-29 10:24:38 -05:00
parent 739d261119
commit 95b848fa61
2 changed files with 163 additions and 201 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/java.base/share/classes/sun/security/ssl/SSLAlgorithmDecomposer.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -266,7 +266,8 @@ class SSLAlgorithmDecomposer extends AlgorithmDecomposer {
// ignore: unknown or unsupported ciphersuite
}
if (cipherSuite != null) {
if (cipherSuite != null &&
cipherSuite != CipherSuite.TLS_EMPTY_RENEGOTIATION_INFO_SCSV) {
return decompose(cipherSuite.keyExchange,
cipherSuite.bulkCipher,
cipherSuite.macAlg,