commit 90ade2f491d5662a2e3ab91c4a0e4faecd7fa10b
author Seth Moore <sethmo@google.com> Mon Nov 29 23:23:02 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 29 23:23:02 2021 +0000
tree 6f969e062a46b69434cdd1826392965721091786
parent b9f9bfac86184bd466ee9aa6d9fcaadf9acd7510
parent cae8f35307df5a921b853776a3800dd9bc09f975

Merge "Fix logic for token searching on authorize_create" into sc-v2-dev

keystore2/src/enforcements.rs

diff --git a/keystore2/src/enforcements.rs b/keystore2/src/enforcements.rs
index 29a3f0b..b7b40f7 100644
--- a/keystore2/src/enforcements.rs
+++ b/keystore2/src/enforcements.rs
@@ -633,7 +633,7 @@
 
         let hat_and_last_off_body = if need_auth_token {
             let hat_and_last_off_body = Self::find_auth_token(|hat: &AuthTokenEntry| {
-                if let (Some(auth_type), true) = (user_auth_type, has_sids) {
+                if let (Some(auth_type), true) = (user_auth_type, timeout_bound) {
                     hat.satisfies(&user_secure_ids, auth_type)
                 } else {
                     unlocked_device_required