diff options
| author | Seth Moore <sethmo@google.com> | 2021-07-01 20:10:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-01 20:10:14 +0000 |
| commit | b29fe1eb2648d90d15b9a960291fecd337009ac6 (patch) | |
| tree | 96aa23aa40de08dfc066911af910fdbf940c258b | |
| parent | c980e0f1412cca5341da7a160a28e0c15aaf983a (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: Ib20ecd68c08d2af64b51e2f4eadf368d2489505e
| -rw-r--r-- | security/keymint/aidl/android/hardware/security/keymint/IKeyMintDevice.aidl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/security/keymint/aidl/android/hardware/security/keymint/IKeyMintDevice.aidl b/security/keymint/aidl/android/hardware/security/keymint/IKeyMintDevice.aidl index 4cecff7f7a..2241735928 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 @@ interface IKeyMintDevice { 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. * |