diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-06-09 01:10:25 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-06-09 01:10:25 +0000 |
| commit | 45a33393be24c083abf9e899f4d211bbf8084e4e (patch) | |
| tree | 1e8a9760b2d295d06655248eb97866d7095fc3e9 | |
| parent | 05648b64f97e35e8e7b32c6af7294da13f3f40c3 (diff) | |
| parent | 3f3dabc64703c01449507238459aa1e2665515b9 (diff) | |
| download | keymaster-45a33393be24c083abf9e899f4d211bbf8084e4e.tar.gz | |
Snap for 7439149 from 3f3dabc64703c01449507238459aa1e2665515b9 to sc-release
Change-Id: I6c4d176608303e5ad9cf5b1f28c4f8565a61910b
| -rw-r--r-- | ng/AndroidKeyMintDevice.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ng/AndroidKeyMintDevice.cpp b/ng/AndroidKeyMintDevice.cpp index 80cf086..f511c3f 100644 --- a/ng/AndroidKeyMintDevice.cpp +++ b/ng/AndroidKeyMintDevice.cpp @@ -83,11 +83,8 @@ vector<KeyCharacteristics> convertKeyCharacteristics(SecurityLevel keyMintSecuri /* Unimplemented */ case KM_TAG_ALLOW_WHILE_ON_BODY: case KM_TAG_BOOTLOADER_ONLY: - case KM_TAG_EARLY_BOOT_ONLY: case KM_TAG_ROLLBACK_RESISTANT: case KM_TAG_STORAGE_KEY: - case KM_TAG_TRUSTED_CONFIRMATION_REQUIRED: - case KM_TAG_TRUSTED_USER_PRESENCE_REQUIRED: break; /* Keystore-enforced if not locally generated. */ @@ -140,6 +137,7 @@ vector<KeyCharacteristics> convertKeyCharacteristics(SecurityLevel keyMintSecuri case KM_TAG_BOOT_PATCHLEVEL: case KM_TAG_CALLER_NONCE: case KM_TAG_DIGEST: + case KM_TAG_EARLY_BOOT_ONLY: case KM_TAG_EC_CURVE: case KM_TAG_EXPORTABLE: case KM_TAG_INCLUDE_UNIQUE_ID: @@ -155,6 +153,8 @@ vector<KeyCharacteristics> convertKeyCharacteristics(SecurityLevel keyMintSecuri case KM_TAG_PURPOSE: case KM_TAG_RSA_OAEP_MGF_DIGEST: case KM_TAG_RSA_PUBLIC_EXPONENT: + case KM_TAG_TRUSTED_CONFIRMATION_REQUIRED: + case KM_TAG_TRUSTED_USER_PRESENCE_REQUIRED: case KM_TAG_UNLOCKED_DEVICE_REQUIRED: case KM_TAG_USER_AUTH_TYPE: case KM_TAG_USER_SECURE_ID: |