commit a7c14a69f6d9c3513368ebf462f741f1620ecb6a
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Jul 11 17:00:24 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 11 17:00:24 2024 +0000
tree bffef9f25583c45468c45c51f7fc599764fdd9d6
parent 6b8245f6ef455c9b054b8cda8db793c3b4a53d60
parent 1923636f073624307fe6c5ada52f464d3f7f6acc

Merge "Ignore INVALID tags in generated key characteristics." into main

keystore2/test_utils/key_generations.rs

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!(