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

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

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