| commit | 6a4109b755085aa47945f51803018708f1686443 | [log] [tgz] |
|---|---|---|
| author | Seth Moore <sethmo@google.com> | Tue Jul 13 17:50:40 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 13 17:50:40 2021 +0000 |
| tree | d7ccc60dbfa46d4332be0f727f4f6afadf9ca8ac | |
| parent | a9cd1e7a6ec4474a1349793a486cb9af99e98d81 [diff] | |
| parent | f640f5c65a6d73eebdb07af8b4a9ca945d4d3c13 [diff] |
Don't fail on TAG_ALLOW_WHILE_ON_BODY am: f640f5c65a Original change: https://googleplex-android-review.googlesource.com/c/platform/system/keymaster/+/15263309 Change-Id: I17374cea81145a67ff686142a478429a2bccd10d
diff --git a/key_blob_utils/software_keyblobs.cpp b/key_blob_utils/software_keyblobs.cpp index 3151edf..de038f0 100644 --- a/key_blob_utils/software_keyblobs.cpp +++ b/key_blob_utils/software_keyblobs.cpp
@@ -266,8 +266,12 @@ LOG_E("Root of trust and origin tags may not be specified", 0); return KM_ERROR_INVALID_TAG; - // These aren't supported by SoftKeymaster. case KM_TAG_ALLOW_WHILE_ON_BODY: + // Not supported, but is specified to noop in that case (vs error). + LOG_W("No on-body detection supported, skipping tag %d", entry.tag); + break; + + // These aren't supported by SoftKeymaster. case KM_TAG_DEVICE_UNIQUE_ATTESTATION: case KM_TAG_ECIES_SINGLE_HASH_MODE: case KM_TAG_EXPORTABLE: