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

8206176: Remove the temporary tls13VN field

Browse Source 
Reviewed-by: xuelei, wetmore
This commit is contained in:
Rajan Halade 2018-08-14 17:21:44 -07:00
parent 2896ec27e1
commit 02a3769cfa
2 changed files with 1 additions and 21 deletions
src/java.base/share/classes/sun/security/ssl
ProtocolVersion.javaSSLConfiguration.java

3
src/java.base/share/classes/sun/security/ssl/ProtocolVersion.java

@ -38,8 +38,7 @@ import java.util.List;
* @since 1.4.1
*/
enum ProtocolVersion {
// TLS13 (0x0304, "TLSv1.3", false),
TLS13 (SSLConfiguration.tls13VN, "TLSv1.3", false),
TLS13 (0x0304, "TLSv1.3", false),
TLS12 (0x0303, "TLSv1.2", false),
TLS11 (0x0302, "TLSv1.1", false),
TLS10 (0x0301, "TLSv1", false),

19
src/java.base/share/classes/sun/security/ssl/SSLConfiguration.java

@ -100,10 +100,6 @@ final class SSLConfiguration implements Cloneable {
static final boolean acknowledgeCloseNotify = Utilities.getBooleanProperty(
"jdk.tls.acknowledgeCloseNotify", false);
// TODO: Please remove after TLS 1.3 draft interop testing
// delete me
static int tls13VN;
// Is the extended_master_secret extension supported?
static {
boolean supportExtendedMasterSecret = Utilities.getBooleanProperty(
@ -116,21 +112,6 @@ static int tls13VN;
}
}
useExtendedMasterSecret = supportExtendedMasterSecret;
// delete me
try {
tls13VN =
AccessController.doPrivileged(
new PrivilegedExceptionAction<Integer>() {
@Override
public Integer run() throws Exception {
return Integer.parseInt(
System.getProperty("jdk.tls13.version", "0304"), 16);
}
});
} catch (PrivilegedActionException ex) {
// blank
}
}
SSLConfiguration(SSLContextImpl sslContext, boolean isClientMode) {