| commit | 241295940e500f5570ad6b368eb0feb76cc1bc58 | [log] [tgz] |
|---|---|---|
| author | Eran Messeri <eranm@google.com> | Fri Jun 18 13:04:59 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 18 13:04:59 2021 +0000 |
| tree | b8a8647e2220248cf228272a8fabb88e05be9434 | |
| parent | 7031fc05d2bfd50d79edd9aafd14eacb17a3f5bc [diff] | |
| parent | cd489e35d39e32eb7fbec5156941c7e720b8ea58 [diff] |
Merge "KeyMint: Document KeyCharacteristics" am: 30a6b0e7f0 am: cd489e35d3 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1736773 Change-Id: I0cf6aed6e658184e2a6c86a75c7ea96d74c2ef30
diff --git a/security/keymint/aidl/android/hardware/security/keymint/KeyCharacteristics.aidl b/security/keymint/aidl/android/hardware/security/keymint/KeyCharacteristics.aidl index 25fdee3..f0df048 100644 --- a/security/keymint/aidl/android/hardware/security/keymint/KeyCharacteristics.aidl +++ b/security/keymint/aidl/android/hardware/security/keymint/KeyCharacteristics.aidl
@@ -32,6 +32,17 @@ */ @VintfStability parcelable KeyCharacteristics { + /** + * The security level enforcing this collection of key properties. + */ SecurityLevel securityLevel = SecurityLevel.SOFTWARE; + + /** + * `authorizations` is a list of key properties that are enforced at this security level. + * A key can have different properties enforced by components of different security levels. + * For example, some properties are provided by the operating system, which has a + * different security level to the IKeyMintDevice. + * See the `keyCharacteristics` field in `KeyCreationResult` for more details. + */ KeyParameter[] authorizations; }