From 657f71cd26a679e505099d25c0482b41e9d2772c Mon Sep 17 00:00:00 2001 From: Shawn Willden Date: Thu, 28 Jan 2021 11:56:14 -0700 Subject: [PATCH] Add attestation key to generate/import messages Bug: 171845787 Test: Build Change-Id: I59bd25dc8998668f0ea2053f3e647bf6cc58885a --- trusty/keymaster/3.0/TrustyKeymaster3Device.cpp | 2 +- trusty/keymaster/4.0/TrustyKeymaster4Device.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/trusty/keymaster/3.0/TrustyKeymaster3Device.cpp b/trusty/keymaster/3.0/TrustyKeymaster3Device.cpp index 7184e4d2a..d787f7a97 100644 --- a/trusty/keymaster/3.0/TrustyKeymaster3Device.cpp +++ b/trusty/keymaster/3.0/TrustyKeymaster3Device.cpp @@ -276,7 +276,7 @@ Return TrustyKeymaster3Device::importKey(const hidl_vec& 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); diff --git a/trusty/keymaster/4.0/TrustyKeymaster4Device.cpp b/trusty/keymaster/4.0/TrustyKeymaster4Device.cpp index 73ad6ae52..e68ba82dc 100644 --- a/trusty/keymaster/4.0/TrustyKeymaster4Device.cpp +++ b/trusty/keymaster/4.0/TrustyKeymaster4Device.cpp @@ -391,7 +391,7 @@ Return TrustyKeymaster4Device::importKey(const hidl_vec& 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);