archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -100,10 +100,6 @@ final class SSLConfiguration implements Cloneable {
static final boolean acknowledgeCloseNotify = Utilities.getBooleanProperty( static final boolean acknowledgeCloseNotify = Utilities.getBooleanProperty(
"jdk.tls.acknowledgeCloseNotify", false); "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? // Is the extended_master_secret extension supported?
static { static {
boolean supportExtendedMasterSecret = Utilities.getBooleanProperty( boolean supportExtendedMasterSecret = Utilities.getBooleanProperty(
@ -116,21 +112,6 @@ static int tls13VN;
} }
} }
useExtendedMasterSecret = supportExtendedMasterSecret; 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) { SSLConfiguration(SSLContextImpl sslContext, boolean isClientMode) {