diff options
| author | Shawn Willden <swillden@google.com> | 2016-01-28 07:56:36 +0000 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2016-01-28 08:23:09 -0800 |
| commit | 9b9cf60715d5f747392369358b915d881ec67600 (patch) | |
| tree | d2a3b6801443288ab1f162f8a3cade348195fb7e /android_keymaster.cpp | |
| parent | c9b68db953e4ced11106411b721f750d04ac006b (diff) | |
| download | android_system_keymaster-9b9cf60715d5f747392369358b915d881ec67600.tar.gz android_system_keymaster-9b9cf60715d5f747392369358b915d881ec67600.tar.bz2 android_system_keymaster-9b9cf60715d5f747392369358b915d881ec67600.zip | |
Revert "Add attestation support to AndroidKeymaster."
This reverts commit d3ee550ac91a5c21343d9885a0e231281057e916.
Change-Id: Iac1ec8025d5411050fc599273995baa9cf575dc9
Diffstat (limited to 'android_keymaster.cpp')
| -rw-r--r-- | android_keymaster.cpp | 17 |
1 files changed, 0 insertions, 17 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; |