| commit | 2724716d242b2bdb2c57fa5e1c454047e7072a37 | [log] [tgz] |
|---|---|---|
| author | David Drysdale <drysdale@google.com> | Tue Feb 18 10:40:24 2025 -0800 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 18 10:40:24 2025 -0800 |
| tree | f27c6394dd75cafdca76d951c052b766d34621fe | |
| parent | f3bc8704ef7276d34a3d37beb609a316328951d4 [diff] | |
| parent | e524ab64b84ec07735af88f399c00b3abaac4744 [diff] |
Merge "KeyMint: wrapping key must be RSA" into main am: e524ab64b8 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3498472 Change-Id: Iea1a45ee13125c3feb6820efaf169886d27d1394 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/security/keymint/aidl/android/hardware/security/keymint/IKeyMintDevice.aidl b/security/keymint/aidl/android/hardware/security/keymint/IKeyMintDevice.aidl index fc703e9..1908d05 100644 --- a/security/keymint/aidl/android/hardware/security/keymint/IKeyMintDevice.aidl +++ b/security/keymint/aidl/android/hardware/security/keymint/IKeyMintDevice.aidl
@@ -479,8 +479,8 @@ * structure. * * @param unwrappingParams must contain any parameters needed to perform the unwrapping - * operation. For example, if the wrapping key is an AES key the block and padding modes - * must be specified in this argument. + * operation. For example, the padding mode for the RSA wrapping key must be specified + * in this argument. * * @param passwordSid specifies the password secure ID (SID) of the user that owns the key being * installed. If the authorization list in wrappedKeyData contains a