commit 2eef1356a8c0d2592f8d0e8af63ecbec81d59c5a
author Shawn Willden <swillden@google.com> Tue May 22 16:13:24 2018 -0600
committer Shawn Willden <swillden@google.com> Tue May 22 17:00:26 2018 -0600
tree 35d3a05dafc2a4656d0a808373d6296084b33196
parent 41705f271e14558e66125fed4b9b9510fd475fd8

Fix StrongBox verification token support.

Change-Id: I7dd51b1443e607fcca330ffb679b27c68c36cf7d
Bug: 79698245
Test: Keystore CTS tests with dummy strongbox enabled

keystore/operation.cpp

diff --git a/keystore/operation.cpp b/keystore/operation.cpp
index 93b1e92..4069060 100644
--- a/keystore/operation.cpp
+++ b/keystore/operation.cpp
@@ -95,12 +95,19 @@
     return mLru.front();
 }
 
-bool OperationMap::setOperationAuthToken(const sp<IBinder>& token, HardwareAuthToken authToken) {
+void OperationMap::setOperationAuthToken(const sp<IBinder>& token, HardwareAuthToken authToken) {
     auto entry = mMap.find(token);
-    if (entry == mMap.end()) return false;
+    if (entry == mMap.end()) return;
 
     entry->second.authToken = std::move(authToken);
-    return true;
+}
+
+void OperationMap::setOperationVerificationToken(const sp<IBinder>& token,
+                                                 VerificationToken verificationToken) {
+    auto entry = mMap.find(token);
+    if (entry == mMap.end()) return;
+
+    entry->second.verificationToken = std::move(verificationToken);
 }
 
 std::vector<sp<IBinder>> OperationMap::getOperationsForToken(const sp<IBinder>& appToken) {