src/java.base/share/classes/sun/security/ssl/Finished.java

rev 52900 : 8232581: Improve TLS verification
Reviewed-by: xuelei, rhalade, mschoene

*** 883,892 ****
--- 883,894 ----
                  ByteBuffer message) throws IOException {
              // Make sure that any expected CertificateVerify message
              // has been received and processed.
              if (!chc.isResumption) {
                  if (chc.handshakeConsumers.containsKey(
+                         SSLHandshake.CERTIFICATE.id) ||
+                     chc.handshakeConsumers.containsKey(
                          SSLHandshake.CERTIFICATE_VERIFY.id)) {
                      throw chc.conContext.fatal(Alert.UNEXPECTED_MESSAGE,
                              "Unexpected Finished handshake message");
                  }
              }
*** 1015,1024 ****
--- 1017,1028 ----
                  ByteBuffer message) throws IOException {
              // Make sure that any expected CertificateVerify message
              // has been received and processed.
              if (!shc.isResumption) {
                  if (shc.handshakeConsumers.containsKey(
+                         SSLHandshake.CERTIFICATE.id) ||
+                     shc.handshakeConsumers.containsKey(
                          SSLHandshake.CERTIFICATE_VERIFY.id)) {
                      throw shc.conContext.fatal(Alert.UNEXPECTED_MESSAGE,
                              "Unexpected Finished handshake message");
                  }
              }