tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Add attestation key to generate/import messages" am: bd90bfabb2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibbee9a9746f0a8c36629536944c56e20c4b654ce
This commit is contained in:
Treehugger Robot 2021-01-30 00:32:06 +00:00 committed by Automerger Merge Worker
commit 349ef2e51b
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
trusty/keymaster/3.0/TrustyKeymaster3Device.cpp
View file

@ -276,7 +276,7 @@ Return<void> TrustyKeymaster3Device::importKey(const hidl_vec<KeyParameter>& par
ImportKeyRequest request(impl_->message_version());
request.key_description.Reinitialize(KmParamSet(params));
request.key_format = legacy_enum_conversion(keyFormat);
request.SetKeyMaterial(keyData.data(), keyData.size());
request.key_data = KeymasterKeyBlob(keyData.data(), keyData.size());
ImportKeyResponse response(impl_->message_version());
impl_->ImportKey(request, &response);

2
trusty/keymaster/4.0/TrustyKeymaster4Device.cpp
View file

@ -391,7 +391,7 @@ Return<void> TrustyKeymaster4Device::importKey(const hidl_vec<KeyParameter>& par
ImportKeyRequest request(impl_->message_version());
request.key_description.Reinitialize(KmParamSet(params));
request.key_format = legacy_enum_conversion(keyFormat);
request.SetKeyMaterial(keyData.data(), keyData.size());
request.key_data = KeymasterKeyBlob(keyData.data(), keyData.size());
ImportKeyResponse response(impl_->message_version());
impl_->ImportKey(request, &response);