ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "KeyMint HAL: process destroyAttestationIds" into main

Browse source
This commit is contained in:
David Drysdale 2023-08-11 09:26:12 +00:00 • committed by Gerrit Code Review
commit 2f6bd6fa43
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
trusty/keymaster/TrustyKeymaster.cpp
View file

@ -218,6 +218,11 @@ void TrustyKeymaster::DeleteAllKeys(const DeleteAllKeysRequest& request,
ForwardCommand(KM_DELETE_ALL_KEYS, request, response); 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, void TrustyKeymaster::BeginOperation(const BeginOperationRequest& request,
BeginOperationResponse* response) { BeginOperationResponse* response) {
ForwardCommand(KM_BEGIN_OPERATION, request, response); ForwardCommand(KM_BEGIN_OPERATION, request, response);

2
trusty/keymaster/include/trusty_keymaster/TrustyKeymaster.h
View file

@ -55,6 +55,8 @@ class TrustyKeymaster {
void UpgradeKey(const UpgradeKeyRequest& request, UpgradeKeyResponse* response); void UpgradeKey(const UpgradeKeyRequest& request, UpgradeKeyResponse* response);
void DeleteKey(const DeleteKeyRequest& request, DeleteKeyResponse* response); void DeleteKey(const DeleteKeyRequest& request, DeleteKeyResponse* response);
void DeleteAllKeys(const DeleteAllKeysRequest& request, DeleteAllKeysResponse* response); void DeleteAllKeys(const DeleteAllKeysRequest& request, DeleteAllKeysResponse* response);
void DestroyAttestationIds(const DestroyAttestationIdsRequest& request,
DestroyAttestationIdsResponse* response);
void BeginOperation(const BeginOperationRequest& request, BeginOperationResponse* response); void BeginOperation(const BeginOperationRequest& request, BeginOperationResponse* response);
void UpdateOperation(const UpdateOperationRequest& request, UpdateOperationResponse* response); void UpdateOperation(const UpdateOperationRequest& request, UpdateOperationResponse* response);
void FinishOperation(const FinishOperationRequest& request, FinishOperationResponse* response); void FinishOperation(const FinishOperationRequest& request, FinishOperationResponse* response);

6
trusty/keymaster/keymint/TrustyKeyMintDevice.cpp
View file

@ -258,7 +258,11 @@ ScopedAStatus TrustyKeyMintDevice::deleteAllKeys() {
} }
ScopedAStatus TrustyKeyMintDevice::destroyAttestationIds() { 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, ScopedAStatus TrustyKeyMintDevice::begin(KeyPurpose purpose, const vector<uint8_t>& keyBlob,