commit 7bb448fa2b5239d559f21df8e3b3c5b072242964
author David Drysdale <drysdale@google.com> Fri Jun 16 05:48:07 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jun 16 05:48:07 2023 +0000
tree 91f5e7959bb8d26fc01322235592863321767155
parent 69bfd9e86a769ca19161fe06b0396e9f7dadccb4
parent cdeb7302af5a30d62aab712a71b32f0b46a4dcaa

Merge "keystore: log receipt of auth tokens" am: cdeb7302af

Original change: https://android-review.googlesource.com/c/platform/system/security/+/2628119

Change-Id: I606835e31c4c2c23101188442bcf5cc543f75428
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

keystore2/src/authorization.rs

diff --git a/keystore2/src/authorization.rs b/keystore2/src/authorization.rs
index 4f2c7bd..de7f19a 100644
--- a/keystore2/src/authorization.rs
+++ b/keystore2/src/authorization.rs
@@ -128,6 +128,15 @@
         // Check keystore permission.
         check_keystore_permission(KeystorePerm::AddAuth).context(ks_err!())?;
 
+        log::info!(
+            "add_auth_token(challenge={}, userId={}, authId={}, authType={:#x}, timestamp={}ms)",
+            auth_token.challenge,
+            auth_token.userId,
+            auth_token.authenticatorId,
+            auth_token.authenticatorType.0,
+            auth_token.timestamp.milliSeconds,
+        );
+
         ENFORCEMENTS.add_auth_token(auth_token.clone());
         Ok(())
     }