ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "KeyMint HAL: pass auth token on updateAad" am: 5b8dfacf5b

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2101110

Change-Id: If8335ede4b6322895858c095a3f5ee1e765ecac1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
David Drysdale 2022-05-19 07:58:43 +00:00 • committed by Automerger Merge Worker
commit 07615033a0
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
trusty/keymaster/keymint/TrustyKeyMintOperation.cpp
View file

@ -52,11 +52,15 @@ TrustyKeyMintOperation::~TrustyKeyMintOperation() {
}
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);