Keystore:Assuming KeyMint version 1 and above am: 0c7b5dcc13

Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/2252034

Change-Id: I57a7e5110986915794f3d0311851070367204251
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2 files changed, 18 insertions, 0 deletions

diff --git a/keystore-cts/java/android/keystore/cts/util/KeyStoreUtil.java b/keystore-cts/java/android/keystore/cts/util/KeyStoreUtil.java
index 8bb774e..c2fee69 100644
--- a/keystore-cts/java/android/keystore/cts/util/KeyStoreUtil.java
+++ b/keystore-cts/java/android/keystore/cts/util/KeyStoreUtil.java
@@ -14,6 +14,8 @@
 package android.keystore.cts.util;
 
 import android.security.keystore.KeyProtection;
+import android.keystore.cts.util.TestUtils;
+import androidx.test.core.app.ApplicationProvider;
 import org.bouncycastle.asn1.x500.X500Name;
 import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
 import org.bouncycastle.cert.X509CertificateHolder;
@@ -84,6 +86,10 @@ public class KeyStoreUtil {
         }
     }
 
+    public static int getFeatureVersionKeystore() {
+       return TestUtils.getFeatureVersionKeystore(ApplicationProvider.getApplicationContext());
+    }
+
     public static X509Certificate createCertificate(
             KeyPair keyPair, X500Principal subject, X500Principal issuer)
             throws OperatorCreationException, CertificateException, IOException {
diff --git a/keystore-cts/java/com/google/security/wycheproof/testcases/JsonEcdhTest.java b/keystore-cts/java/com/google/security/wycheproof/testcases/JsonEcdhTest.java
index d790add..3f0e6b8 100644
--- a/keystore-cts/java/com/google/security/wycheproof/testcases/JsonEcdhTest.java
+++ b/keystore-cts/java/com/google/security/wycheproof/testcases/JsonEcdhTest.java
@@ -14,6 +14,7 @@
 package com.google.security.wycheproof;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assume.assumeTrue;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -29,6 +30,7 @@ import java.security.spec.InvalidKeySpecException;
 import java.security.spec.X509EncodedKeySpec;
 import javax.crypto.KeyAgreement;
 import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.Ignore;
 import android.security.keystore.KeyProtection;
@@ -47,6 +49,16 @@ public class JsonEcdhTest {
     KeyStoreUtil.cleanUpKeyStore();
   }
 
+  @Before
+  public void setup() {
+    // In this test class ECDH keys are imported for key agreement (PURPOSE_AGREE_KEY).
+    // KeyMaster could support this key import through software emulation,
+    // but currently it is missing (b/216434270). Hence, this assumption is added till ECDH
+    // key import software emulation is not implemented.
+    assumeTrue("PURPOSE_AGREE_KEY is supported in KeyMint version 1 and above.",
+            KeyStoreUtil.getFeatureVersionKeystore() >= KeyStoreUtil.KM_VERSION_KEYMINT_1);
+  }
+
   /** Convenience mehtod to get a String from a JsonObject */
   protected static String getString(JsonObject object, String name) throws Exception {
     return object.get(name).getAsString();