stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8171337: Check for correct SSLEngineImpl/SSLSocketImpl.setSSLParameters handshaker update method

Browse Source 
Reviewed-by: wetmore
This commit is contained in:
Xue-Lei Andrew Fan 2016-12-20 20:26:34 +00:00
parent 2cae845615
commit 252d6991bc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jdk/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java
View File

@ -2244,7 +2244,7 @@ public final class SSLEngineImpl extends SSLEngine {
} }
applicationProtocols = params.getApplicationProtocols(); applicationProtocols = params.getApplicationProtocols();
if ((handshaker != null) && !handshaker.started()) { if ((handshaker != null) && !handshaker.activated()) {
handshaker.setIdentificationProtocol(identificationProtocol); handshaker.setIdentificationProtocol(identificationProtocol);
handshaker.setAlgorithmConstraints(algorithmConstraints); handshaker.setAlgorithmConstraints(algorithmConstraints);
handshaker.setMaximumPacketSize(maximumPacketSize); handshaker.setMaximumPacketSize(maximumPacketSize);

6
jdk/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
View File

@ -2158,7 +2158,7 @@ public final class SSLSocketImpl extends BaseSSLSocketImpl {
Utilities.addToSNIServerNameList(serverNames, host); Utilities.addToSNIServerNameList(serverNames, host);
if (!roleIsServer && if (!roleIsServer &&
(handshaker != null) && !handshaker.started()) { (handshaker != null) && !handshaker.activated()) {
handshaker.setSNIServerNames(serverNames); handshaker.setSNIServerNames(serverNames);
} }
} }
@ -2186,7 +2186,7 @@ public final class SSLSocketImpl extends BaseSSLSocketImpl {
this.serverNames = this.serverNames =
Utilities.addToSNIServerNameList(this.serverNames, this.host); Utilities.addToSNIServerNameList(this.serverNames, this.host);
if (!roleIsServer && (handshaker != null) && !handshaker.started()) { if (!roleIsServer && (handshaker != null) && !handshaker.activated()) {
handshaker.setSNIServerNames(serverNames); handshaker.setSNIServerNames(serverNames);
} }
} }
@ -2638,7 +2638,7 @@ public final class SSLSocketImpl extends BaseSSLSocketImpl {
applicationProtocols = params.getApplicationProtocols(); applicationProtocols = params.getApplicationProtocols();
if ((handshaker != null) && !handshaker.started()) { if ((handshaker != null) && !handshaker.activated()) {
handshaker.setIdentificationProtocol(identificationProtocol); handshaker.setIdentificationProtocol(identificationProtocol);
handshaker.setAlgorithmConstraints(algorithmConstraints); handshaker.setAlgorithmConstraints(algorithmConstraints);
handshaker.setMaximumPacketSize(maximumPacketSize); handshaker.setMaximumPacketSize(maximumPacketSize);