| commit | 91291abe21e12724dd210b8be8607207df31223b | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Mar 18 17:30:13 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 18 17:30:13 2022 +0000 |
| tree | a7a24c34ff8cd83034b8a68643a2f15fc407472b | |
| parent | 74c8ab2bf6357fe0e24660d2f503df6bda98404f [diff] | |
| parent | 0dc92fe34d9fcd8a1ff60431fa9daaecabc42300 [diff] |
Merge "Don't pass Tag::INCLUDE_UNIQUE_ID to attestKey" am: 13269794f6 am: 0dc92fe34d Original change: https://android-review.googlesource.com/c/platform/system/security/+/2030544 Change-Id: I5f0183de1049dc0452dd3779b0b2965d75967352
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: