commit 5b8dfacf5b1dc5ab0ea8c8afcb02a3c0c842c967
author David Drysdale <drysdale@google.com> Thu May 19 05:50:51 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 19 05:50:51 2022 +0000
tree f6a236163fe5f212a7d91c03025881783f36a185
parent 91d24d5bad64421bb2430680a47b0225f286d114
parent 37a8ac1d459d1bbe0b6dc3fb5fa89c78b3e97c2d

Merge "KeyMint HAL: pass auth token on updateAad"

trusty/keymaster/keymint/TrustyKeyMintOperation.cpp

diff --git a/trusty/keymaster/keymint/TrustyKeyMintOperation.cpp b/trusty/keymaster/keymint/TrustyKeyMintOperation.cpp
index 9440724..78e765e 100644
--- a/trusty/keymaster/keymint/TrustyKeyMintOperation.cpp
+++ b/trusty/keymaster/keymint/TrustyKeyMintOperation.cpp
@@ -52,11 +52,15 @@
 }
 
 ScopedAStatus TrustyKeyMintOperation::updateAad(
-        const vector<uint8_t>& input, const optional<HardwareAuthToken>& /* authToken */,
+        const vector<uint8_t>& input, const optional<HardwareAuthToken>& authToken,
         const optional<TimeStampToken>& /* timestampToken */) {
     UpdateOperationRequest request(impl_->message_version());
     request.op_handle = opHandle_;
     request.additional_params.push_back(TAG_ASSOCIATED_DATA, input.data(), input.size());
+    if (authToken) {
+        auto tokenAsVec(authToken2AidlVec(*authToken));
+        request.additional_params.push_back(TAG_AUTH_TOKEN, tokenAsVec.data(), tokenAsVec.size());
+    }
 
     UpdateOperationResponse response(impl_->message_version());
     impl_->UpdateOperation(request, &response);