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

Commit 2f6bd6fa authored by David Drysdale's avatar David Drysdale Committed by Gerrit Code Review
Browse files

Merge "KeyMint HAL: process destroyAttestationIds" into main

parents 236dbc30 cedcb4cd

trusty/keymaster/TrustyKeymaster.cpp

+5 −0
Original line number Diff line number Diff line
@@ -218,6 +218,11 @@ void TrustyKeymaster::DeleteAllKeys(const DeleteAllKeysRequest& request, 
    ForwardCommand(KM_DELETE_ALL_KEYS, request, response);

}



void TrustyKeymaster::DestroyAttestationIds(const DestroyAttestationIdsRequest& request,

                                            DestroyAttestationIdsResponse* response) {

    ForwardCommand(KM_DESTROY_ATTESTATION_IDS, request, response);

}



void TrustyKeymaster::BeginOperation(const BeginOperationRequest& request,

                                     BeginOperationResponse* response) {

    ForwardCommand(KM_BEGIN_OPERATION, request, response);

trusty/keymaster/include/trusty_keymaster/TrustyKeymaster.h

+2 −0
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ class TrustyKeymaster { 
    void UpgradeKey(const UpgradeKeyRequest& request, UpgradeKeyResponse* response);

    void DeleteKey(const DeleteKeyRequest& request, DeleteKeyResponse* response);

    void DeleteAllKeys(const DeleteAllKeysRequest& request, DeleteAllKeysResponse* response);

    void DestroyAttestationIds(const DestroyAttestationIdsRequest& request,

                               DestroyAttestationIdsResponse* response);

    void BeginOperation(const BeginOperationRequest& request, BeginOperationResponse* response);

    void UpdateOperation(const UpdateOperationRequest& request, UpdateOperationResponse* response);

    void FinishOperation(const FinishOperationRequest& request, FinishOperationResponse* response);

trusty/keymaster/keymint/TrustyKeyMintDevice.cpp

+5 −1
Original line number Diff line number Diff line
@@ -258,7 +258,11 @@ ScopedAStatus TrustyKeyMintDevice::deleteAllKeys() { 
}



ScopedAStatus TrustyKeyMintDevice::destroyAttestationIds() {

    return kmError2ScopedAStatus(KM_ERROR_UNIMPLEMENTED);

    keymaster::DestroyAttestationIdsRequest request(impl_->message_version());

    keymaster::DestroyAttestationIdsResponse response(impl_->message_version());

    impl_->DestroyAttestationIds(request, &response);



    return kmError2ScopedAStatus(response.error);

}



ScopedAStatus TrustyKeyMintDevice::begin(KeyPurpose purpose, const vector<uint8_t>& keyBlob,