diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-01-24 08:20:58 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-01-24 08:20:58 +0000 |
| commit | fdcbe80c124c7116ca634389b0e2195aad6bc5ec (patch) | |
| tree | 522199c960adba312a631fb4c2419f3ae9100ce0 | |
| parent | 81cffec9b9e89652ea4f70dbd6c9c5ff62ed6d10 (diff) | |
| parent | ec35536ef9f3a1929cbe0efd15bec49a0a659b64 (diff) | |
Snap for 4562879 from ec35536ef9f3a1929cbe0efd15bec49a0a659b64 to pi-release
Change-Id: I1730e427d95cf8c84b5656d2f72381f7721809c5
| -rw-r--r-- | keystore/keymaster_enforcement.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/keystore/keymaster_enforcement.cpp b/keystore/keymaster_enforcement.cpp index c6d9a55..30e97f4 100644 --- a/keystore/keymaster_enforcement.cpp +++ b/keystore/keymaster_enforcement.cpp @@ -335,9 +335,11 @@ ErrorCode KeymasterEnforcement::AuthorizeBegin(const KeyPurpose purpose, const k /* Tags that are implicitly verified by secure side */ case Tag::APPLICATION_ID: - case Tag::OS_VERSION: + case Tag::BOOT_PATCHLEVEL: case Tag::OS_PATCHLEVEL: + case Tag::OS_VERSION: case Tag::TRUSTED_USER_PRESENCE_REQUIRED: + case Tag::VENDOR_PATCHLEVEL: /* TODO(swillden): Handle these */ case Tag::INCLUDE_UNIQUE_ID: |