Removed assumption after software emulation support am: 52862ce682 am: 0a89faefb2 am: 94446b3aaa

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

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

1 files changed, 0 insertions, 10 deletions

diff --git a/keystore-cts/java/com/google/security/wycheproof/testcases/EcdhTest.java b/keystore-cts/java/com/google/security/wycheproof/testcases/EcdhTest.java
index fc54787..f57ad29 100644
--- a/keystore-cts/java/com/google/security/wycheproof/testcases/EcdhTest.java
+++ b/keystore-cts/java/com/google/security/wycheproof/testcases/EcdhTest.java
@@ -48,7 +48,6 @@ import android.security.keystore.KeyProtection;
 import android.security.keystore.KeyProperties;
 import android.security.keystore.KeyGenParameterSpec;
 import android.keystore.cts.util.KeyStoreUtil;
-import android.keystore.cts.util.TestUtils;
 
 import androidx.test.InstrumentationRegistry;
 
@@ -829,15 +828,6 @@ public static final EcPublicKeyTestVector EC_VALID_PUBLIC_KEY =
 
   @Test
   public void testNistCurveLargePrivateKey() throws Exception {
-    Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();
-    /**
-     * Software emulation of ECDH / AGREE_KEY function is performed by Keystore when the underlying
-     * device is a Keymaster implementation rather than KeyMint. However, this emulated support does
-     * not (yet) support imported ECDH keys, so skip the test if this is the case (b/216434270).
-     */
-    assumeTrue("This test can only test with keymint version 1 and above",
-            TestUtils.getFeatureVersionKeystore(context) >= KeyStoreUtil.KM_VERSION_KEYMINT_1);
-
     testLargePrivateKey(EcUtil.getNistP224Params());
     testLargePrivateKey(EcUtil.getNistP256Params());
     testLargePrivateKey(EcUtil.getNistP384Params());