diff options
author | Hasini Gunasinghe <hasinitg@google.com> | 2023-07-12 15:55:06 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-07-12 15:55:06 +0000 |
commit | 5b0d15ca45431ebe842c1972a8d4cde11e4f7c35 (patch) | |
tree | 729b1c52baccd5745896d501044868814f2248e1 | |
parent | 1484de2094c7bac97cd073ea790419b3ed9ba767 (diff) | |
parent | f25f780262a441e5513125585e97aee5cccc124f (diff) | |
download | wycheproof-5b0d15ca45431ebe842c1972a8d4cde11e4f7c35.tar.gz |
Add checks depending on whether the test is targetting strongbox or not am: f25f780262
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wycheproof/+/24023904
Change-Id: I72df99f955d267ce5e711a325695b3ef9870b448
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | keystore-cts/java/android/keystore/cts/util/KeyStoreUtil.java | 6 | ||||
-rw-r--r-- | keystore-cts/java/com/google/security/wycheproof/testcases/RsaOaepTest.java | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/keystore-cts/java/android/keystore/cts/util/KeyStoreUtil.java b/keystore-cts/java/android/keystore/cts/util/KeyStoreUtil.java index ea5d91b..14020e0 100644 --- a/keystore-cts/java/android/keystore/cts/util/KeyStoreUtil.java +++ b/keystore-cts/java/android/keystore/cts/util/KeyStoreUtil.java @@ -91,7 +91,11 @@ public class KeyStoreUtil { } } - public static int getFeatureVersionKeystore() { + public static int getFeatureVersionKeystore(boolean isStrongBox) { + if (isStrongBox) { + return TestUtils.getFeatureVersionKeystoreStrongBox( + ApplicationProvider.getApplicationContext()); + } return TestUtils.getFeatureVersionKeystore(ApplicationProvider.getApplicationContext()); } 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 5eb47e5..29f8905 100644 --- a/keystore-cts/java/com/google/security/wycheproof/testcases/RsaOaepTest.java +++ b/keystore-cts/java/com/google/security/wycheproof/testcases/RsaOaepTest.java @@ -192,14 +192,14 @@ public class RsaOaepTest { } protected static OAEPParameterSpec getOaepParameters(JsonObject group, - JsonObject test) throws Exception { + JsonObject test, boolean isStrongBox) throws Exception { String sha = getString(group, "sha"); String mgf = getString(group, "mgf"); String mgfSha = getString(group, "mgfSha"); // mgfDigest other than SHA-1 are supported from KeyMint V1 and above. if (!mgfSha.equalsIgnoreCase("SHA-1")) { assumeTrue("This test is valid for KeyMint version 1 and above.", - KeyStoreUtil.getFeatureVersionKeystore() >= KeyStoreUtil.KM_VERSION_KEYMINT_1); + KeyStoreUtil.getFeatureVersionKeystore(isStrongBox) >= KeyStoreUtil.KM_VERSION_KEYMINT_1); } PSource p = PSource.PSpecified.DEFAULT; if (test.has("label") && !TextUtils.isEmpty(getString(test, "label"))) { @@ -305,7 +305,7 @@ public class RsaOaepTest { String messageHex = TestUtil.bytesToHex(getBytes(testcase, "msg")); OAEPParameterSpec params; try { - params = getOaepParameters(group, testcase); + params = getOaepParameters(group, testcase, isStrongBox); } catch (UnsupportedKeyParametersException e) { // TODO This try catch block should be removed once issue b/229183581 is fixed. continue; |