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

8235448: code cleanup in SSLContextImpl.java

Browse Source 
Reviewed-by: jnimeh
This commit is contained in:
Xue-Lei Andrew Fan 2019-12-09 10:56:27 -08:00
parent 45b8d09e1b
commit baebce3d2f
1 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java
View File

@ -25,7 +25,7 @@
package sun.security.ssl;
import java.io.*;
import java.io.FileInputStream;
import java.net.Socket;
import java.security.*;
import java.security.cert.*;
@ -71,7 +71,8 @@ public abstract class SSLContextImpl extends SSLContextSpi {
private volatile StatusResponseManager statusResponseManager;
private final ReentrantLock contextLock = new ReentrantLock();
final HashMap<Integer, SessionTicketExtension.StatelessKey> keyHashMap = new HashMap<>();
final HashMap<Integer,
SessionTicketExtension.StatelessKey> keyHashMap = new HashMap<>();
SSLContextImpl() {
@ -594,17 +595,6 @@ public abstract class SSLContextImpl extends SSLContextSpi {
boolean isDTLS() {
return false;
}
static ProtocolVersion[] getSupportedProtocols() {
return new ProtocolVersion[]{
ProtocolVersion.TLS13,
ProtocolVersion.TLS12,
ProtocolVersion.TLS11,
ProtocolVersion.TLS10,
ProtocolVersion.SSL30,
ProtocolVersion.SSL20Hello
};
}
}
/*
@ -858,9 +848,24 @@ public abstract class SSLContextImpl extends SSLContextSpi {
ProtocolVersion[] candidates;
if (refactored.isEmpty()) {
if (client) {
candidates = getProtocols();
// default client protocols
candidates = new ProtocolVersion[] {
ProtocolVersion.TLS13,
ProtocolVersion.TLS12,
ProtocolVersion.TLS11,
ProtocolVersion.TLS10,
ProtocolVersion.SSL30
};
} else {
candidates = getSupportedProtocols();
candidates = new ProtocolVersion[] {
ProtocolVersion.TLS13,
ProtocolVersion.TLS12,
ProtocolVersion.TLS11,
ProtocolVersion.TLS10,
ProtocolVersion.SSL30,
ProtocolVersion.SSL20Hello
};
}
} else {
// Use the customized TLS protocols.
@ -871,16 +876,6 @@ public abstract class SSLContextImpl extends SSLContextSpi {
return getAvailableProtocols(candidates);
}
static ProtocolVersion[] getProtocols() {
return new ProtocolVersion[]{
ProtocolVersion.TLS13,
ProtocolVersion.TLS12,
ProtocolVersion.TLS11,
ProtocolVersion.TLS10,
ProtocolVersion.SSL30
};
}
protected CustomizedTLSContext() {
if (reservedException != null) {
throw reservedException;
@ -906,8 +901,6 @@ public abstract class SSLContextImpl extends SSLContextSpi {
List<CipherSuite> getServerDefaultCipherSuites() {
return serverDefaultCipherSuites;
}
}
/*
@ -1183,7 +1176,6 @@ public abstract class SSLContextImpl extends SSLContextSpi {
private static final List<CipherSuite> serverDefaultCipherSuites;
static {
// Both DTLSv1.0 and DTLSv1.2 can be used in FIPS mode.
supportedProtocols = Arrays.asList(
ProtocolVersion.DTLS12,
ProtocolVersion.DTLS10