| commit | 2450f64535ae9a863e76ecb41389d09cafd2a859 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Jun 01 21:01:45 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 01 21:01:45 2021 +0000 |
| tree | bdde653264d6d938cb7be95aed8a302eb51e0083 | |
| parent | f48ab20b1258592ecf69387a2c5ec7945c0f0f42 [diff] | |
| parent | fe7eac4e0620dba4714a6bd2ef93eee00169dfc0 [diff] |
Merge "Correct the description for getKeyCharacteristics" am: e8d43f7e59 am: bb1b56ab1f am: bf3990ca24 am: fe7eac4e06 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1723364 Change-Id: I7efe5822e1409070e2e6acaa0ab7396154586615
diff --git a/security/keymint/aidl/android/hardware/security/keymint/IKeyMintDevice.aidl b/security/keymint/aidl/android/hardware/security/keymint/IKeyMintDevice.aidl index 9cc795d..5b0b303 100644 --- a/security/keymint/aidl/android/hardware/security/keymint/IKeyMintDevice.aidl +++ b/security/keymint/aidl/android/hardware/security/keymint/IKeyMintDevice.aidl
@@ -805,9 +805,10 @@ byte[] convertStorageKeyToEphemeral(in byte[] storageKeyBlob); /** - * Returns parameters associated with the provided key. This should match the - * KeyCharacteristics present in the KeyCreationResult returned by generateKey(), - * importKey(), or importWrappedKey(). + * Returns KeyMint-enforced parameters associated with the provided key. The returned tags are + * a subset of KeyCharacteristics found in the KeyCreationResult returned by generateKey(), + * importKey(), or importWrappedKey(). The returned value is a subset, as it does not include + * any Keystore-enforced parameters. * * @param keyBlob The opaque descriptor returned by generateKey, importKey or importWrappedKey. *