Snap for 9336400 from 32426d11ca83fcbd6738dedac42a9dd0fbbe4e45 to udc-release

Change-Id: I13a9147e7f3c42b8e8d8eb7466ef8a239c5b01e3

2 files changed, 1 insertions, 11 deletions

diff --git a/keystore-cts/java/android/keystore/cts/util/KeyStoreUtil.java b/keystore-cts/java/android/keystore/cts/util/KeyStoreUtil.java
index 9f430c1..a6c186f 100644
--- a/keystore-cts/java/android/keystore/cts/util/KeyStoreUtil.java
+++ b/keystore-cts/java/android/keystore/cts/util/KeyStoreUtil.java
@@ -101,7 +101,7 @@ public class KeyStoreUtil {
     }
 
     public static boolean isStrongBoxSupportKeySize(int keySize) {
-        return keySize == 1024 || keySize == 2048;
+        return keySize == 2048;
     }
 
     public static X509Certificate createCertificate(
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());