| commit | cd489e35d39e32eb7fbec5156941c7e720b8ea58 | [log] [tgz] |
|---|---|---|
| author | Eran Messeri <eranm@google.com> | Fri Jun 18 12:52:07 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 18 12:52:07 2021 +0000 |
| tree | c216970bae028240d23292534adf63f112d4cf2e | |
| parent | 2b6e3bb6ea3d36d4101d900567a3c9933dfe56bd [diff] | |
| parent | 30a6b0e7f02b221648bbe5749e3cfd1338004104 [diff] |
Merge "KeyMint: Document KeyCharacteristics" am: 30a6b0e7f0 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1736773 Change-Id: Iad780ddff46fc981cf9356597328cdfa07e9b5bf
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; }