commit aad6cea2c8ca4f4234fef44d0f633a210558c7ed
author Treehugger Robot <treehugger-gerrit@google.com> Sat Mar 20 23:06:55 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Mar 20 23:06:55 2021 +0000
tree a66d041ca418f5db056d58f343d0dd44baa1cd17
parent 9b49201b938a810e6a4c36c2f996fec7877ddcd4
parent e3f7d20bedc36c5a61270ac03124236209ee57b4

Merge "Keystore 2.0: Respect Keymint hardware info timestampTokenRequired."

keystore2/src/security_level.rs

diff --git a/keystore2/src/security_level.rs b/keystore2/src/security_level.rs
index 641b77a..255e92f 100644
--- a/keystore2/src/security_level.rs
+++ b/keystore2/src/security_level.rs
@@ -270,10 +270,7 @@
                 purpose,
                 key_properties.as_ref(),
                 operation_parameters.as_ref(),
-                // TODO b/178222844 Replace this with the configuration returned by
-                //      KeyMintDevice::getHardwareInfo.
-                //      For now we assume that strongbox implementations need secure timestamps.
-                self.security_level == SecurityLevel::STRONGBOX,
+                self.hw_info.timestampTokenRequired,
             )
             .context("In create_operation.")?;