--- a/src/java.base/share/classes/sun/security/ssl/CertificateMessage.java Fri Jun 15 14:07:25 2018 -0700
+++ b/src/java.base/share/classes/sun/security/ssl/CertificateMessage.java Tue Jun 19 09:05:57 2018 -0700
@@ -607,7 +607,7 @@
if (chc.negotiatedCipherSuite.keyExchange ==
CipherSuite.KeyExchange.K_RSA_EXPORT ||
chc.negotiatedCipherSuite.keyExchange ==
- CipherSuite.KeyExchange.K_DHE_RSA_EXPORT) {
+ CipherSuite.KeyExchange.K_DHE_RSA_EXPORT) {
keyExchangeString = CipherSuite.KeyExchange.K_RSA.name;
} else {
keyExchangeString = chc.negotiatedCipherSuite.keyExchange.name;
--- a/src/java.base/share/classes/sun/security/ssl/ExtendedMasterSecretExtension.java Fri Jun 15 14:07:25 2018 -0700
+++ b/src/java.base/share/classes/sun/security/ssl/ExtendedMasterSecretExtension.java Tue Jun 19 09:05:57 2018 -0700
@@ -36,7 +36,7 @@
import sun.security.ssl.SSLHandshake.HandshakeMessage;
/**
- * Pack of the "extended_master_secret" extensions [RFC 5746].
+ * Pack of the "extended_master_secret" extensions [RFC 7627].
*/
final class ExtendedMasterSecretExtension {
static final HandshakeProducer chNetworkProducer =
--- a/src/java.base/share/classes/sun/security/ssl/PredefinedDHParameterSpecs.java Fri Jun 15 14:07:25 2018 -0700
+++ b/src/java.base/share/classes/sun/security/ssl/PredefinedDHParameterSpecs.java Tue Jun 19 09:05:57 2018 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/src/java.base/share/classes/sun/security/ssl/SSLAlgorithmDecomposer.java Fri Jun 15 14:07:25 2018 -0700
+++ b/src/java.base/share/classes/sun/security/ssl/SSLAlgorithmDecomposer.java Tue Jun 19 09:05:57 2018 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,17 +31,7 @@
import sun.security.ssl.CipherSuite.KeyExchange;
import static sun.security.ssl.CipherSuite.KeyExchange.*;
import sun.security.ssl.CipherSuite.MacAlg;
-import static sun.security.ssl.SSLCipher.B_3DES;
-import static sun.security.ssl.SSLCipher.B_AES_128;
-import static sun.security.ssl.SSLCipher.B_AES_128_GCM;
-import static sun.security.ssl.SSLCipher.B_AES_256;
-import static sun.security.ssl.SSLCipher.B_AES_256_GCM;
-import static sun.security.ssl.SSLCipher.B_DES;
-import static sun.security.ssl.SSLCipher.B_DES_40;
-import static sun.security.ssl.SSLCipher.B_NULL;
-import static sun.security.ssl.SSLCipher.B_RC2_40;
-import static sun.security.ssl.SSLCipher.B_RC4_128;
-import static sun.security.ssl.SSLCipher.B_RC4_40;
+import static sun.security.ssl.SSLCipher.*;
import sun.security.util.AlgorithmDecomposer;
/**