diff options
| author | Seth Moore <sethmo@google.com> | 2022-04-14 16:41:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-14 16:41:47 +0000 |
| commit | 127e7de5967e97c6c793d24ae31cb0ed31c04d0e (patch) | |
| tree | 4cced23bd39c3f8125c711340ebc52063c8d022c | |
| parent | b8801ba861e56c402298684bdb0100bd1a83d440 (diff) | |
| parent | 2b1f503a9c698853526f8194188e7d2cc7f9122c (diff) | |
| download | security-127e7de5967e97c6c793d24ae31cb0ed31c04d0e.tar.gz | |
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: I782c44f45d853064569db5039ba03d8603163171
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | keystore2/src/km_compat/km_compat.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/keystore2/src/km_compat/km_compat.cpp b/keystore2/src/km_compat/km_compat.cpp index 192f4455..6d0630b4 100644 --- a/keystore2/src/km_compat/km_compat.cpp +++ b/keystore2/src/km_compat/km_compat.cpp @@ -126,7 +126,7 @@ bool isKeyCreationParameter(const KMV1::KeyParameter& param) { 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: |