diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-12-20 05:21:00 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-12-20 05:21:00 +0000 |
commit | 7fa0b03edd59e926e4f326d71271b1cb5af1f2ad (patch) | |
tree | 34c0c26b1f9f5835753c7d8a8653632375ac82b6 | |
parent | 8a7d56b6b8b1e5ca88176f4c802baefef5332c62 (diff) | |
parent | 23ee57bd8dfb56d2d52b3e671ec27ab8f66bd6c5 (diff) | |
download | wycheproof-7fa0b03edd59e926e4f326d71271b1cb5af1f2ad.tar.gz |
Snap for 9421497 from 23ee57bd8dfb56d2d52b3e671ec27ab8f66bd6c5 to udc-d1-release
Change-Id: I12eeff18bf84b57be90535e4e1f6927737bc6b70
-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); } } |