| commit | 62aeb3035cd4a11aaf082c3d8cfd76e9b44a7c96 | [log] [tgz] |
|---|---|---|
| author | Seth Moore <sethmo@google.com> | Thu Apr 14 16:43:03 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 14 16:43:03 2022 +0000 |
| tree | 4cced23bd39c3f8125c711340ebc52063c8d022c | |
| parent | 2b161030122df4290a82f280f01caf0ecf398fe2 [diff] | |
| parent | 2b1f503a9c698853526f8194188e7d2cc7f9122c [diff] |
Merge "Fix unique id attestation on devices with keymaster" am: 451c96f1e3 am: 5272ab0641 am: 38be482975 am: 2b1f503a9c Original change: https://android-review.googlesource.com/c/platform/system/security/+/2064510 Change-Id: Ia3bd16510c2b649f926d4e0534f1dd6fd8ae6271 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/keystore2/src/km_compat/km_compat.cpp b/keystore2/src/km_compat/km_compat.cpp index 192f445..6d0630b 100644 --- a/keystore2/src/km_compat/km_compat.cpp +++ b/keystore2/src/km_compat/km_compat.cpp
@@ -126,7 +126,7 @@ case Tag::TRUSTED_CONFIRMATION_REQUIRED: case Tag::UNLOCKED_DEVICE_REQUIRED: case Tag::CREATION_DATETIME: - case Tag::UNIQUE_ID: + case Tag::INCLUDE_UNIQUE_ID: case Tag::IDENTITY_CREDENTIAL_KEY: case Tag::STORAGE_KEY: case Tag::MAC_LENGTH: