| commit | 0a8eed87667fb661a4f52fc18521ef6e8c527ec4 | [log] [tgz] |
|---|---|---|
| author | Seth Moore <sethmo@google.com> | Thu Jul 01 20:09:38 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 01 20:09:38 2021 +0000 |
| tree | 96aa23aa40de08dfc066911af910fdbf940c258b | |
| parent | ebd33b28a39b4c0841f1844fdb3b9317beabbe76 [diff] | |
| parent | 8b78dc5031a12819a477399374f3e3807777c7b2 [diff] |
Correct the description for getKeyCharacteristics am: 8b78dc5031 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15175667 Change-Id: Id8664ee643a3241803210ae4a37cc3af01a7c112
diff --git a/security/keymint/aidl/android/hardware/security/keymint/IKeyMintDevice.aidl b/security/keymint/aidl/android/hardware/security/keymint/IKeyMintDevice.aidl index 4cecff7..2241735 100644 --- a/security/keymint/aidl/android/hardware/security/keymint/IKeyMintDevice.aidl +++ b/security/keymint/aidl/android/hardware/security/keymint/IKeyMintDevice.aidl
@@ -813,9 +813,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. *