8207223: SSL Handshake failures are reported with more generic SSLException
authorweijun
Sat, 21 Jul 2018 21:46:42 +0800
changeset 51222 d5138f8da1ba
parent 51221 b65916c52e3c
child 51223 7efacf6d4cc6
8207223: SSL Handshake failures are reported with more generic SSLException Reviewed-by: xuelei
src/java.base/share/classes/sun/security/ssl/Alert.java
--- a/src/java.base/share/classes/sun/security/ssl/Alert.java	Fri Jul 20 18:03:23 2018 -0400
+++ b/src/java.base/share/classes/sun/security/ssl/Alert.java	Sat Jul 21 21:46:42 2018 +0800
@@ -31,6 +31,7 @@
 import java.util.Locale;
 import javax.net.ssl.SSLException;
 import javax.net.ssl.SSLHandshakeException;
+import javax.net.ssl.SSLProtocolException;
 
 /**
  * SSL/(D)TLS Alter description
@@ -121,8 +122,11 @@
             reason = (cause != null) ? cause.getMessage() : "";
         }
 
-        SSLException ssle = handshakeOnly ?
-                new SSLHandshakeException(reason) : new SSLException(reason);
+        SSLException ssle = (this == UNEXPECTED_MESSAGE) ?
+                new SSLProtocolException(reason) :
+                (handshakeOnly ?
+                        new SSLHandshakeException(reason) :
+                        new SSLException(reason));
         if (cause != null) {
             ssle.initCause(cause);
         }