--- a/src/java.base/share/classes/sun/security/ssl/CookieExtension.java	Thu May 24 09:21:01 2018 -0700
+++ b/src/java.base/share/classes/sun/security/ssl/CookieExtension.java	Thu May 24 11:34:31 2018 -0700
@@ -63,10 +63,6 @@
     static class CookieSpec implements SSLExtensionSpec {
         final byte[] cookie;
 
-        CookieSpec(byte[] cookie) {
-            this.cookie = cookie;
-        }
-
         private CookieSpec(ByteBuffer m) throws IOException {
             // opaque cookie<1..2^16-1>;
             if (m.remaining() < 3) {

--- a/src/java.base/share/classes/sun/security/ssl/DHClientKeyExchange.java	Thu May 24 09:21:01 2018 -0700
+++ b/src/java.base/share/classes/sun/security/ssl/DHClientKeyExchange.java	Thu May 24 11:34:31 2018 -0700
@@ -278,7 +278,7 @@
                 DHPublicKeySpec spec = new DHPublicKeySpec(
                         new BigInteger(1, ckem.y),
                         params.getP(), params.getG());
-                KeyFactory kf = JsseJce.getKeyFactory("DH");
+                KeyFactory kf = JsseJce.getKeyFactory("DiffieHellman");
                 DHPublicKey peerPublicKey =
                         (DHPublicKey)kf.generatePublic(spec);
 

--- a/src/java.base/share/classes/sun/security/ssl/DHKeyExchange.java	Thu May 24 09:21:01 2018 -0700
+++ b/src/java.base/share/classes/sun/security/ssl/DHKeyExchange.java	Thu May 24 11:34:31 2018 -0700
@@ -103,7 +103,8 @@
 
         DHEPossession(NamedGroup namedGroup, SecureRandom random) {
             try {
-                KeyPairGenerator kpg = JsseJce.getKeyPairGenerator("DH");
+                KeyPairGenerator kpg =
+                        JsseJce.getKeyPairGenerator("DiffieHellman");
                 DHParameterSpec params =
                         (DHParameterSpec)namedGroup.getParameterSpec();
                 kpg.initialize(params, random);
@@ -151,7 +152,8 @@
 
         DHEPossession(DHECredentials credentials, SecureRandom random) {
             try {
-                KeyPairGenerator kpg = JsseJce.getKeyPairGenerator("DH");
+                KeyPairGenerator kpg =
+                        JsseJce.getKeyPairGenerator("DiffieHellman");
                 kpg.initialize(credentials.popPublicKey.getParams(), random);
                 KeyPair kp = generateDHKeyPair(kpg);
                 if (kp == null) {
@@ -457,7 +459,7 @@
             private SecretKey t12DeriveKey(String algorithm,
                     AlgorithmParameterSpec params) throws IOException {
                 try {
-                    KeyAgreement ka = JsseJce.getKeyAgreement("DH");
+                    KeyAgreement ka = JsseJce.getKeyAgreement("DiffieHellman");
                     ka.init(localPrivateKey);
                     ka.doPhase(peerPublicKey, true);
                     SecretKey preMasterSecret =
@@ -477,7 +479,7 @@
             private SecretKey t13DeriveKey(String algorithm,
                     AlgorithmParameterSpec params) throws IOException {
                 try {
-                    KeyAgreement ka = JsseJce.getKeyAgreement("DH");
+                    KeyAgreement ka = JsseJce.getKeyAgreement("DiffieHellman");
                     ka.init(localPrivateKey);
                     ka.doPhase(peerPublicKey, true);
                     SecretKey sharedSecret =