diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-01-18 08:28:23 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-01-18 08:28:23 +0000 |
| commit | 3726669d993705e00880a9bbee1412ff7e67da0e (patch) | |
| tree | 461dfd6e19c60b0f06ef465e9a9c511e356fa30b | |
| parent | 1d57baa84caf63c4d019b703b449af5034e46fc9 (diff) | |
| parent | c8cdf0ec734ec181bf705b1d4f1a6a787bcd2054 (diff) | |
Snap for 4551672 from c8cdf0ec734ec181bf705b1d4f1a6a787bcd2054 to pi-release
Change-Id: I9df8e1fc1fcb4f0f4e7b2bc4746550e05007f9db
| -rw-r--r-- | keystore/keymaster_enforcement.cpp | 1 | ||||
| -rw-r--r-- | keystore/operation.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/keystore/keymaster_enforcement.cpp b/keystore/keymaster_enforcement.cpp index 16d1354..c6d9a55 100644 --- a/keystore/keymaster_enforcement.cpp +++ b/keystore/keymaster_enforcement.cpp @@ -337,6 +337,7 @@ ErrorCode KeymasterEnforcement::AuthorizeBegin(const KeyPurpose purpose, const k case Tag::APPLICATION_ID: case Tag::OS_VERSION: case Tag::OS_PATCHLEVEL: + case Tag::TRUSTED_USER_PRESENCE_REQUIRED: /* TODO(swillden): Handle these */ case Tag::INCLUDE_UNIQUE_ID: diff --git a/keystore/operation.h b/keystore/operation.h index 389f9f8..6f640da 100644 --- a/keystore/operation.h +++ b/keystore/operation.h @@ -49,7 +49,7 @@ class OperationMap { Operation(Operation&&) = default; Operation(const Operation&) = delete; - bool hasAuthToken() const { return authToken.mac.size() == 0; } + bool hasAuthToken() const { return authToken.mac.size() != 0; } uint64_t handle; uint64_t keyid; |