commit cf91dcdee36775965938f5535480d6345821b459
author Janis Danisevskis <jdanis@google.com> Fri Apr 20 16:58:22 2018 -0700
committer Janis Danisevskis <jdanis@google.com> Mon Apr 23 15:12:36 2018 +0000
tree 8733ced55317ab40901c92dde07ae0ea309b3655
parent 6e2e1afad871394e488b2a145961dd90edb24076

Remove CONFIRMATION_TOKEN from update parameters.

The CONFIRMATION_TOKEN can only be checked on finish. And this is the
only time it should be passed to keymaster according to spec. The
spurious CONFIRMATION_TOKEN parameter let strict implemenations fail.
This patch prevents the token from being passed to update.

Test: Manually tested with km4 and confirmationdemo.apk
Bug: 78451119
Change-Id: Ib2ac6d77393246700662aa6f1e5c5514ebe38036

keystore/key_store_service.cpp

diff --git a/keystore/key_store_service.cpp b/keystore/key_store_service.cpp
index c8a8f84..22524c9 100644
--- a/keystore/key_store_service.cpp
+++ b/keystore/key_store_service.cpp
@@ -1405,7 +1405,6 @@
     if (!result->resultCode.isOk()) return Status::ok();
 
     std::vector<KeyParameter> inParams = params.getParameters();
-    appendConfirmationTokenIfNeeded(op.characteristics, &inParams);
 
     auto hidlCb = [&](ErrorCode ret, uint32_t inputConsumed,
                       const hidl_vec<KeyParameter>& outParams,