| commit | 0dc92fe34d9fcd8a1ff60431fa9daaecabc42300 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Mar 18 17:15:41 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 18 17:15:41 2022 +0000 |
| tree | a7a24c34ff8cd83034b8a68643a2f15fc407472b | |
| parent | 6bf3847189d7a5b2a7d3a21f6631aebad16e1efe [diff] | |
| parent | 13269794f6e7231df2a997f234b3a2f8a8f1d2a6 [diff] |
Merge "Don't pass Tag::INCLUDE_UNIQUE_ID to attestKey" am: 13269794f6 Original change: https://android-review.googlesource.com/c/platform/system/security/+/2030544 Change-Id: Ic3b5f3714413fbab0547cd88bf901eeedbf2690f
diff --git a/keystore2/src/km_compat/km_compat.cpp b/keystore2/src/km_compat/km_compat.cpp index 3db1a9f..192f445 100644 --- a/keystore2/src/km_compat/km_compat.cpp +++ b/keystore2/src/km_compat/km_compat.cpp
@@ -80,7 +80,6 @@ case Tag::CERTIFICATE_SUBJECT: case Tag::CERTIFICATE_NOT_BEFORE: case Tag::CERTIFICATE_NOT_AFTER: - case Tag::INCLUDE_UNIQUE_ID: case Tag::DEVICE_UNIQUE_ATTESTATION: return true; default: