diff options
author | Prashant Patil <patilprashant@google.com> | 2022-12-19 15:45:54 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-12-19 15:45:54 +0000 |
commit | 38490d55e81fe9382fa9413d5a91ed23d8d12359 (patch) | |
tree | 34c0c26b1f9f5835753c7d8a8653632375ac82b6 | |
parent | abe6b210c57b090bcc8c7a18ec09b20697f1490a (diff) | |
parent | dea239ad0ae7fa57c5e148fe71c36a454b21bec5 (diff) | |
download | wycheproof-38490d55e81fe9382fa9413d5a91ed23d8d12359.tar.gz |
Keystore: Added missing assumption statement am: 82033fa109 am: 7c243c7cf1 am: dea239ad0a
Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/2358820
Change-Id: If614a1fc3bf854f1f56a58e3a33ee8de893508bf
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/RsaOaepTest.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/keystore-cts/java/com/google/security/wycheproof/testcases/RsaOaepTest.java b/keystore-cts/java/com/google/security/wycheproof/testcases/RsaOaepTest.java index 9d9e911..39a3b0a 100644 --- a/keystore-cts/java/com/google/security/wycheproof/testcases/RsaOaepTest.java +++ b/keystore-cts/java/com/google/security/wycheproof/testcases/RsaOaepTest.java @@ -255,6 +255,9 @@ public class RsaOaepTest { public void testOaep(String filename, boolean allowSkippingKeys, boolean isStrongBox) throws Exception { + if (isStrongBox) { + KeyStoreUtil.assumeStrongBox(); + } JsonObject test = JsonUtil.getTestVectors(this.getClass(), filename); // Compares the expected and actual JSON schema of the test vector file. @@ -360,7 +363,7 @@ public class RsaOaepTest { @Test public void testRsaOaep2048Sha1Mgf1Sha1_StrongBox() throws Exception { - testOaep("rsa_oaep_2048_sha1_mgf1sha1_test.json", true); + testOaep("rsa_oaep_2048_sha1_mgf1sha1_test.json", true, true); } @Test @@ -379,7 +382,6 @@ public class RsaOaepTest { } @Test public void testRsaOaep2048Sha256Mgf1Sha1_StrongBox() throws Exception { - KeyStoreUtil.assumeStrongBox(); testOaep("rsa_oaep_2048_sha256_mgf1sha1_test.json", false, true); } @@ -389,7 +391,6 @@ public class RsaOaepTest { } @Test public void testRsaOaep2048Sha256Mgf1Sha256_StrongBox() throws Exception { - KeyStoreUtil.assumeStrongBox(); testOaep("rsa_oaep_2048_sha256_mgf1sha256_test.json", false, true); } @@ -459,7 +460,6 @@ public class RsaOaepTest { } @Test public void testRsaOaepMisc_StrongBox() throws Exception { - KeyStoreUtil.assumeStrongBox(); testOaep("rsa_oaep_misc_test.json", false, true); } } |