OpenJDK / amber / amber
changeset 52184:97300133cc23
8206176: Remove the temporary tls13VN field
Reviewed-by: xuelei, wetmore
| author | rhalade |
|---|---|
| date | Tue, 14 Aug 2018 17:21:44 -0700 |
| parents | 33c62af31969 |
| children | 7339b9e38182 |
| files | src/java.base/share/classes/sun/security/ssl/ProtocolVersion.java src/java.base/share/classes/sun/security/ssl/SSLConfiguration.java |
| diffstat | 2 files changed, 1 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/src/java.base/share/classes/sun/security/ssl/ProtocolVersion.java Tue Aug 14 16:36:17 2018 -0700 +++ b/src/java.base/share/classes/sun/security/ssl/ProtocolVersion.java Tue Aug 14 17:21:44 2018 -0700 @@ -38,8 +38,7 @@ * @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),
--- a/src/java.base/share/classes/sun/security/ssl/SSLConfiguration.java Tue Aug 14 16:36:17 2018 -0700 +++ b/src/java.base/share/classes/sun/security/ssl/SSLConfiguration.java Tue Aug 14 17:21:44 2018 -0700 @@ -100,10 +100,6 @@ 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 @@ } } 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) {