diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-19 22:09:42 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-19 22:09:42 +0000 |
| commit | 84f313976502fe116b6fa6c47942b323558732da (patch) | |
| tree | 679accf9e0dddd099392264efa0d77017e41bf16 | |
| parent | cd5bc5e83f2d9d037a2b438682ec304031dca9c7 (diff) | |
| parent | 986a2dd96588e162f90323a48af703d66078e3b4 (diff) | |
| download | core-84f313976502fe116b6fa6c47942b323558732da.tar.gz | |
Snap for 8618009 from 986a2dd96588e162f90323a48af703d66078e3b4 to tm-frc-cellbroadcast-release
Change-Id: I15ed3dcbbd67e1848bc0227bbdb8b93c1cf17238
| -rw-r--r-- | trusty/keymaster/keymint/TrustyKeyMintOperation.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/trusty/keymaster/keymint/TrustyKeyMintOperation.cpp b/trusty/keymaster/keymint/TrustyKeyMintOperation.cpp index 9440724da..78e765e9c 100644 --- a/trusty/keymaster/keymint/TrustyKeyMintOperation.cpp +++ b/trusty/keymaster/keymint/TrustyKeyMintOperation.cpp @@ -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); |