diff options
| -rw-r--r-- | android_keymaster.cpp | 17 | ||||
| -rw-r--r-- | include/keymaster/android_keymaster.h | 3 |
2 files changed, 1 insertions, 19 deletions
diff --git a/android_keymaster.cpp b/android_keymaster.cpp index c2ff8e6..f60d6ee 100644 --- a/android_keymaster.cpp +++ b/android_keymaster.cpp @@ -364,23 +364,6 @@ void AndroidKeymaster::ExportKey(const ExportKeyRequest& request, ExportKeyRespo } } -void AndroidKeymaster::AttestKey(const AttestKeyRequest& request, AttestKeyResponse* response) { - if (!response) - return; - - AuthorizationSet tee_enforced; - AuthorizationSet sw_enforced; - const KeyFactory* key_factory; - UniquePtr<Key> key; - response->error = LoadKey(request.key_blob, request.attest_params, &tee_enforced, &sw_enforced, - &key_factory, &key); - if (response->error != KM_ERROR_OK) - return; - - response->error = key->GenerateAttestation(*context_, request.attest_params, tee_enforced, - sw_enforced, &response->certificate_chain); -} - void AndroidKeymaster::ImportKey(const ImportKeyRequest& request, ImportKeyResponse* response) { if (response == NULL) return; diff --git a/include/keymaster/android_keymaster.h b/include/keymaster/android_keymaster.h index c7ecfad..24954d9 100644 --- a/include/keymaster/android_keymaster.h +++ b/include/keymaster/android_keymaster.h @@ -50,7 +50,6 @@ class AndroidKeymaster { AndroidKeymaster(KeymasterContext* context, size_t operation_table_size); virtual ~AndroidKeymaster(); - void GetVersion(const GetVersionRequest& request, GetVersionResponse* response); void SupportedAlgorithms(const SupportedAlgorithmsRequest& request, SupportedAlgorithmsResponse* response); void SupportedBlockModes(const SupportedBlockModesRequest& request, @@ -70,13 +69,13 @@ class AndroidKeymaster { GetKeyCharacteristicsResponse* response); void ImportKey(const ImportKeyRequest& request, ImportKeyResponse* response); void ExportKey(const ExportKeyRequest& request, ExportKeyResponse* response); - void AttestKey(const AttestKeyRequest& request, AttestKeyResponse* response); void DeleteKey(const DeleteKeyRequest& request, DeleteKeyResponse* response); void DeleteAllKeys(const DeleteAllKeysRequest& request, DeleteAllKeysResponse* response); void BeginOperation(const BeginOperationRequest& request, BeginOperationResponse* response); void UpdateOperation(const UpdateOperationRequest& request, UpdateOperationResponse* response); void FinishOperation(const FinishOperationRequest& request, FinishOperationResponse* response); void AbortOperation(const AbortOperationRequest& request, AbortOperationResponse* response); + void GetVersion(const GetVersionRequest& request, GetVersionResponse* response); bool has_operation(keymaster_operation_handle_t op_handle) const; |