summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn Willden <swillden@google.com>2022-06-13 15:23:29 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-06-13 15:23:29 +0000
commit7081bc6c732ffad8e96f8d6e8dac8300036d8fdc (patch)
treeaef41f00df31d1f410e7f550f12af27c824b32b3
parentdeb9281da916640484f1bfd444582586cdc97e69 (diff)
parenta2a1421dd525e13afca476fae55d1b6921ab31da (diff)
downloadkeymaster-7081bc6c732ffad8e96f8d6e8dac8300036d8fdc.tar.gz
Add error logging in GetRootOfTrust am: a2a1421dd5
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/keymaster/+/18808331 Change-Id: I080b11a393d38d5b8e25f9f776965e11e9161339 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--android_keymaster/android_keymaster.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/android_keymaster/android_keymaster.cpp b/android_keymaster/android_keymaster.cpp
index 828dead..420bbf2 100644
--- a/android_keymaster/android_keymaster.cpp
+++ b/android_keymaster/android_keymaster.cpp
@@ -942,21 +942,27 @@ GetRootOfTrustResponse AndroidKeymaster::GetRootOfTrust(const GetRootOfTrustRequ
GetRootOfTrustResponse response(message_version());
if (!context_->attestation_context()) {
+ LOG_E("Have no attestation context, cannot get RootOfTrust", 0);
response.error = KM_ERROR_UNIMPLEMENTED;
return response;
}
const AttestationContext::VerifiedBootParams* vbParams =
context_->attestation_context()->GetVerifiedBootParams(&response.error);
- if (response.error != KM_ERROR_OK) return response;
+ if (response.error != KM_ERROR_OK) {
+ LOG_E("Error retrieving verified boot params: %lu", response.error);
+ return response;
+ }
auto boot_patch_level = context_->GetBootPatchlevel();
if (!boot_patch_level) {
+ LOG_E("Error retrieving boot patch level: %lu", response.error);
response.error = KM_ERROR_UNIMPLEMENTED;
return response;
}
if (!context_->enforcement_policy()) {
+ LOG_E("Have no enforcement policy, cannot get RootOfTrust", 0);
response.error = KM_ERROR_UNIMPLEMENTED;
return response;
}