diff -r 7d19ac37d7d1 -r 6c377af36a5c src/java.base/share/classes/sun/security/ssl/SSLAlgorithmDecomposer.java
--- a/src/java.base/share/classes/sun/security/ssl/SSLAlgorithmDecomposer.java	Wed Jan 30 09:30:40 2019 -0800
+++ b/src/java.base/share/classes/sun/security/ssl/SSLAlgorithmDecomposer.java	Wed Jan 30 15:42:47 2019 -0500
@@ -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 @@
                 // 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,