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

Commit bd90bfab authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Add attestation key to generate/import messages"

parents 95d9a569 657f71cd

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);