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"

Browse source
This commit is contained in:
David Drysdale 2022-05-19 05:50:51 +00:00 • committed by Gerrit Code Review
commit 5b8dfacf5b
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( 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 */) { const optional<TimeStampToken>& /* timestampToken */) {
UpdateOperationRequest request(impl_->message_version()); UpdateOperationRequest request(impl_->message_version());
request.op_handle = opHandle_; request.op_handle = opHandle_;
request.additional_params.push_back(TAG_ASSOCIATED_DATA, input.data(), input.size()); 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()); UpdateOperationResponse response(impl_->message_version());
impl_->UpdateOperation(request, &response); impl_->UpdateOperation(request, &response);