| commit | 9dbe1ab828fb1335eb4563941ada6045d0452570 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Jul 11 17:45:26 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 11 17:45:26 2024 +0000 |
| tree | bc3c70495d0193bb9977d49abb1e85ca334734db | |
| parent | fa685868dc3251cae7a33139105a46db98bc05f3 [diff] | |
| parent | a7c14a69f6d9c3513368ebf462f741f1620ecb6a [diff] |
Merge "Ignore INVALID tags in generated key characteristics." into main am: a7c14a69f6 Original change: https://android-review.googlesource.com/c/platform/system/security/+/3166117 Change-Id: I77cca575b567c4ae4953e4fddf8af71596661e8e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/keystore2/test_utils/key_generations.rs b/keystore2/test_utils/key_generations.rs index fdb2afb..c4161c0 100644 --- a/keystore2/test_utils/key_generations.rs +++ b/keystore2/test_utils/key_generations.rs
@@ -401,9 +401,8 @@ ) { // Make sure key authorizations contains only `ALLOWED_TAGS_IN_KEY_AUTHS` authorizations.iter().all(|auth| { - // Ignore `INVALID` tag if the backend is Keymaster and not KeyMint. - // Keymaster allows INVALID tag for unsupported key parameters. - if sl.is_keymaster() && auth.keyParameter.tag == Tag::INVALID { + // Ignore `INVALID` tag + if auth.keyParameter.tag == Tag::INVALID { return true; } assert!(