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

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

Merge "Fix disagreement of client_id/app_data pointer semantic"

parents aa31cfcd 56c533df

trusty/keymaster/legacy/trusty_keymaster_device.cpp

+2 −2
Original line number Diff line number Diff line
@@ -122,10 +122,10 @@ template <typename RequestType> 
void AddClientAndAppData(const keymaster_blob_t* client_id, const keymaster_blob_t* app_data,

                         RequestType* request) {

    request->additional_params.Clear();

    if (client_id) {

    if (client_id && client_id->data_length > 0) {

        request->additional_params.push_back(TAG_APPLICATION_ID, *client_id);

    }

    if (app_data) {

    if (app_data && app_data->data_length > 0) {

        request->additional_params.push_back(TAG_APPLICATION_DATA, *app_data);

    }

}