8207223: SSL Handshake failures are reported with more generic SSLException

Reviewed-by: xuelei
This commit is contained in:
Weijun Wang 2018-07-21 21:46:42 +08:00
parent a95225aabc
commit 32a2f54b64

View file

@ -31,6 +31,7 @@ import java.text.MessageFormat;
import java.util.Locale; import java.util.Locale;
import javax.net.ssl.SSLException; import javax.net.ssl.SSLException;
import javax.net.ssl.SSLHandshakeException; import javax.net.ssl.SSLHandshakeException;
import javax.net.ssl.SSLProtocolException;
/** /**
* SSL/(D)TLS Alter description * SSL/(D)TLS Alter description
@ -121,8 +122,11 @@ enum Alert {
reason = (cause != null) ? cause.getMessage() : ""; reason = (cause != null) ? cause.getMessage() : "";
} }
SSLException ssle = handshakeOnly ? SSLException ssle = (this == UNEXPECTED_MESSAGE) ?
new SSLHandshakeException(reason) : new SSLException(reason); new SSLProtocolException(reason) :
(handshakeOnly ?
new SSLHandshakeException(reason) :
new SSLException(reason));
if (cause != null) { if (cause != null) {
ssle.initCause(cause); ssle.initCause(cause);
} }