Merge pull request #588 from ZainabF92/issue15412

Deal with non-supported ECKey subclasses
ibmruntimes · Jul 14, 2022 · 0516090 · 0516090
2 parents f390fbe + 859733d
commit 0516090
Showing 1 changed file with 47 additions and 27 deletions.
diff --git a/closed/adds/jdk/src/share/classes/sun/security/ec/NativeECDHKeyAgreement.java b/closed/adds/jdk/src/share/classes/sun/security/ec/NativeECDHKeyAgreement.java
@@ -40,6 +40,7 @@
 import java.security.ProviderException;
 import java.security.PublicKey;
 import java.security.SecureRandom;
+import java.security.interfaces.ECKey;
 import java.security.spec.AlgorithmParameterSpec;
 import java.security.spec.ECGenParameterSpec;
 import java.security.spec.ECParameterSpec;
@@ -100,34 +101,43 @@ protected void engineInit(Key key, SecureRandom random)
                 ("Key must be an instance of PrivateKey");
         }
         /* attempt to translate the key if it is not an ECKey */
-        this.privateKey = (ECPrivateKeyImpl) ECKeyFactory.toECKey(key);
-        this.publicKey = null;
+        ECKey ecKey = ECKeyFactory.toECKey(key);
+        if (ecKey instanceof ECPrivateKeyImpl) {
+            this.privateKey = (ECPrivateKeyImpl) ecKey;
+            this.publicKey = null;
 
-        ECParameterSpec params = this.privateKey.getParams();
-        if (params instanceof NamedCurve) {
-            this.curve = ((NamedCurve) params).getName();
-        } else {
-            /* use the OID */
-            try {
-                AlgorithmParameters algParams = AlgorithmParameters.getInstance("EC");
-                algParams.init(this.privateKey.getParams());
-                this.curve = algParams.getParameterSpec(ECGenParameterSpec.class).getName();
-            } catch (InvalidParameterSpecException | NoSuchAlgorithmException e) {
-                /* should not happen */
-                throw new InternalError(e);
+            ECParameterSpec params = this.privateKey.getParams();
+            if (params instanceof NamedCurve) {
+                this.curve = ((NamedCurve) params).getName();
+            } else {
+                /* use the OID */
+                try {
+                    AlgorithmParameters algParams = AlgorithmParameters.getInstance("EC");
+                    algParams.init(params);
+                    this.curve = algParams.getParameterSpec(ECGenParameterSpec.class).getName();
+                } catch (InvalidParameterSpecException | NoSuchAlgorithmException e) {
+                    /* should not happen */
+                    throw new InternalError(e);
+                }
             }
-        }
 
-        if ((!nativeGF2m) && this.privateKey.isECFieldF2m()) {
-            /* only print the first time a curve is used */
-            if ((curveSupported.putIfAbsent("EC2m", Boolean.FALSE) == null) && (nativeCryptTrace != null)) {
-                System.err.println("EC2m is not supported by OpenSSL, using Java crypto implementation.");
+            if ((!nativeGF2m) && this.privateKey.isECFieldF2m()) {
+                /* only print the first time a curve is used */
+                if ((curveSupported.putIfAbsent("EC2m", Boolean.FALSE) == null) && (nativeCryptTrace != null)) {
+                    System.err.println("EC2m is not supported by OpenSSL, using Java crypto implementation.");
+                }
+                this.initializeJavaImplementation(key, random);
+            } else if (Boolean.FALSE.equals(curveSupported.get(this.curve))) {
+                this.initializeJavaImplementation(key, random);
+            } else {
+                this.javaImplementation = null;
             }
-            this.initializeJavaImplementation(key, random);
-        } else if (Boolean.FALSE.equals(curveSupported.get(this.curve))) {
-            this.initializeJavaImplementation(key, random);
         } else {
-            this.javaImplementation = null;
+            if ((curveSupported.putIfAbsent("ECKeyImpl", Boolean.FALSE) == null) && (nativeCryptTrace != null)) {
+                System.err.println("Only ECPrivateKeyImpl and ECPublicKeyImpl are supported by the native implementation,"
+                        + " using Java crypto implementation.");
+            }
+            this.initializeJavaImplementation(key, random);
         }
     }
 
@@ -162,12 +172,22 @@ protected Key engineDoPhase(Key key, boolean lastPhase)
                 ("Key must be an instance of PublicKey");
         }
         /* attempt to translate the key if it is not an ECKey */
-        this.publicKey = (ECPublicKeyImpl) ECKeyFactory.toECKey(key);
+        ECKey ecKey = ECKeyFactory.toECKey(key);
+        if (ecKey instanceof ECPublicKeyImpl) {
+            this.publicKey = (ECPublicKeyImpl) ecKey;
 
-        int keyLenBits = this.publicKey.getParams().getCurve().getField().getFieldSize();
-        this.secretLen = (keyLenBits + 7) >> 3;
+            int keyLenBits = this.publicKey.getParams().getCurve().getField().getFieldSize();
+            this.secretLen = (keyLenBits + 7) >> 3;
 
-        return null;
+            return null;
+        } else {
+            if ((curveSupported.putIfAbsent("ECKeyImpl", Boolean.FALSE) == null) && (nativeCryptTrace != null)) {
+                System.err.println("Only ECPrivateKeyImpl and ECPublicKeyImpl are supported by the native implementation,"
+                        + " using Java crypto implementation.");
+            }
+            this.initializeJavaImplementation(this.privateKey, null);
+            return this.javaImplementation.engineDoPhase(key, lastPhase);
+        }
     }
 
     @Override