diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-08-11 23:09:58 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-08-11 23:09:58 +0000 |
| commit | cd8a1ad1e632815123af55f9851b3661af04ec7d (patch) | |
| tree | 8536a59c8818cf5eb9ca12d5e56af3783f865469 | |
| parent | 87a32b53e6571b2e10c308b9ecfcf16d168d6b48 (diff) | |
| parent | 02d6a55b23838d6716d5e9b389da4faa3160fce2 (diff) | |
| download | keymaster-cd8a1ad1e632815123af55f9851b3661af04ec7d.tar.gz | |
Snap for 7632648 from 02d6a55b23838d6716d5e9b389da4faa3160fce2 to sc-d2-release
Change-Id: I24813d874d1eb4429ddc5c8e375f222348d39b3a
| -rw-r--r-- | ng/AndroidKeymaster4Device.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/ng/AndroidKeymaster4Device.cpp b/ng/AndroidKeymaster4Device.cpp index a71948e..18d7fb4 100644 --- a/ng/AndroidKeymaster4Device.cpp +++ b/ng/AndroidKeymaster4Device.cpp @@ -511,7 +511,7 @@ Return<void> AndroidKeymaster4Device::begin(KeyPurpose purpose, const hidl_vec<u Return<void> AndroidKeymaster4Device::update(uint64_t operationHandle, const hidl_vec<KeyParameter>& inParams, const hidl_vec<uint8_t>& input, - const HardwareAuthToken& /* authToken */, + const HardwareAuthToken& authToken , const VerificationToken& /* verificationToken */, update_cb _hidl_cb) { UpdateOperationRequest request(impl_->message_version()); @@ -519,6 +519,10 @@ Return<void> AndroidKeymaster4Device::update(uint64_t operationHandle, request.input.Reinitialize(input.data(), input.size()); request.additional_params.Reinitialize(KmParamSet(inParams)); + hidl_vec<uint8_t> hidl_vec_token = authToken2HidlVec(authToken); + request.additional_params.push_back( + TAG_AUTH_TOKEN, reinterpret_cast<uint8_t*>(hidl_vec_token.data()), hidl_vec_token.size()); + UpdateOperationResponse response(impl_->message_version()); impl_->UpdateOperation(request, &response); @@ -538,7 +542,7 @@ Return<void> AndroidKeymaster4Device::finish(uint64_t operationHandle, const hidl_vec<KeyParameter>& inParams, const hidl_vec<uint8_t>& input, const hidl_vec<uint8_t>& signature, - const HardwareAuthToken& /* authToken */, + const HardwareAuthToken& authToken , const VerificationToken& /* verificationToken */, finish_cb _hidl_cb) { FinishOperationRequest request(impl_->message_version()); @@ -547,6 +551,11 @@ Return<void> AndroidKeymaster4Device::finish(uint64_t operationHandle, request.signature.Reinitialize(signature.data(), signature.size()); request.additional_params.Reinitialize(KmParamSet(inParams)); + hidl_vec<uint8_t> hidl_vec_token = authToken2HidlVec(authToken); + request.additional_params.push_back( + TAG_AUTH_TOKEN, reinterpret_cast<uint8_t*>(hidl_vec_token.data()), hidl_vec_token.size()); + + FinishOperationResponse response(impl_->message_version()); impl_->FinishOperation(request, &response); |