Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 657f71cd authored by Shawn Willden's avatar Shawn Willden
Browse files

Add attestation key to generate/import messages 

Bug: 171845787
Test: Build
Change-Id: I59bd25dc8998668f0ea2053f3e647bf6cc58885a
parent feefc674

trusty/keymaster/3.0/TrustyKeymaster3Device.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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);

trusty/keymaster/4.0/TrustyKeymaster4Device.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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);