archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8207029: Unable to use custom SSLEngine with default TrustManagerFactory after updating to JDK 11 b21

Browse source 
Reviewed-by: wetmore
This commit is contained in:
Xue-Lei Andrew Fan 2018-07-13 07:08:59 -07:00
parent 5bd94254bb
commit a98ec3e8bd
1 changed files with 26 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/java.base/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java
View file

@ -73,12 +73,20 @@ final class SSLAlgorithmConstraints implements AlgorithmConstraints {
boolean withDefaultCertPathConstraints) { boolean withDefaultCertPathConstraints) {
AlgorithmConstraints configuredConstraints = null; AlgorithmConstraints configuredConstraints = null;
if (socket != null) { if (socket != null) {
HandshakeContext hc = // Note that the KeyManager or TrustManager implementation may be
((SSLSocketImpl)socket).conContext.handshakeContext; // not implemented in the same provider as SSLSocket/SSLEngine.
if (hc != null) { // Please check the instance before casting to use SSLSocketImpl.
configuredConstraints = hc.sslConfig.algorithmConstraints; if (socket instanceof SSLSocketImpl) {
HandshakeContext hc =
((SSLSocketImpl)socket).conContext.handshakeContext;
if (hc != null) {
configuredConstraints = hc.sslConfig.algorithmConstraints;
} else {
configuredConstraints = null;
}
} else { } else {
configuredConstraints = null; configuredConstraints =
socket.getSSLParameters().getAlgorithmConstraints();
} }
} }
this.userSpecifiedConstraints = configuredConstraints; this.userSpecifiedConstraints = configuredConstraints;
@ -90,12 +98,20 @@ final class SSLAlgorithmConstraints implements AlgorithmConstraints {
boolean withDefaultCertPathConstraints) { boolean withDefaultCertPathConstraints) {
AlgorithmConstraints configuredConstraints = null; AlgorithmConstraints configuredConstraints = null;
if (engine != null) { if (engine != null) {
HandshakeContext hc = // Note that the KeyManager or TrustManager implementation may be
((SSLEngineImpl)engine).conContext.handshakeContext; // not implemented in the same provider as SSLSocket/SSLEngine.
if (hc != null) { // Please check the instance before casting to use SSLEngineImpl.
configuredConstraints = hc.sslConfig.algorithmConstraints; if (engine instanceof SSLEngineImpl) {
HandshakeContext hc =
((SSLEngineImpl)engine).conContext.handshakeContext;
if (hc != null) {
configuredConstraints = hc.sslConfig.algorithmConstraints;
} else {
configuredConstraints = null;
}
} else { } else {
configuredConstraints = null; configuredConstraints =
engine.getSSLParameters().getAlgorithmConstraints();
} }
} }
this.userSpecifiedConstraints = configuredConstraints; this.userSpecifiedConstraints = configuredConstraints;