diff options
| author | Prashant Patil <patilprashant@google.com> | 2022-11-25 15:45:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-11-25 15:45:15 +0000 |
| commit | 94446b3aaa6cfefed92369d07cd4eea045208930 (patch) | |
| tree | 4092f2e931f89b7756760ab051859092eb8c80ac | |
| parent | 1a8badc2378487d162277f49cce1c8c9978612ef (diff) | |
| parent | 0a89faefb2ac3618106b69155fa323e986daa53f (diff) | |
| download | wycheproof-94446b3aaa6cfefed92369d07cd4eea045208930.tar.gz | |
Removed assumption after software emulation support am: 52862ce682 am: 0a89faefb2
Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/2309226
Change-Id: I6c7365e8c5051ca4721e318fd8afe5974f452004
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | keystore-cts/java/com/google/security/wycheproof/testcases/EcdhTest.java | 10 |
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()); |