| commit | bb1b56ab1fca8c51a479ecb1800d849da22e0b70 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Jun 01 20:04:07 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 01 20:04:07 2021 +0000 |
| tree | 2b206b67c291fdf2fff62b93fee8d55d04bae10f | |
| parent | d7ad17bd16742a83f3e2793c9f33f119fdcbcdcc [diff] | |
| parent | e8d43f7e59728744500bb875e1493c1193151bda [diff] |
Merge "Correct the description for getKeyCharacteristics" am: e8d43f7e59 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1723364 Change-Id: Id1c5e9c7b4c6610995a83f779ffc9434e20e3fbd
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. *