src/share/classes/sun/security/ssl/SSLAlgorithmDecomposer.java

*** 1,7 ****
  /*
!  * Copyright (c) 2015, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 237,247 ****
                  cipherSuite = CipherSuite.valueOf(algorithm);
              } catch (IllegalArgumentException iae) {
                  // ignore: unknown or unsupported ciphersuite
              }
  
!             if (cipherSuite != null) {
                  return decompose(cipherSuite.keyExchange, cipherSuite.cipher,
                          cipherSuite.macAlg);
              }
          }
  
--- 237,248 ----
                  cipherSuite = CipherSuite.valueOf(algorithm);
              } catch (IllegalArgumentException iae) {
                  // ignore: unknown or unsupported ciphersuite
              }
  
!             if (cipherSuite != null &&
!                 cipherSuite != CipherSuite.C_SCSV /* TLS_EMPTY_RENEGOTIATION_INFO_SCSV */) {
                  return decompose(cipherSuite.keyExchange, cipherSuite.cipher,
                          cipherSuite.macAlg);
              }
          }