| commit | 0c54514c73ac73e21671fb3a408bbd3af85b1297 | [log] [tgz] |
|---|---|---|
| author | David Drysdale <drysdale@google.com> | Mon Feb 13 19:29:29 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Feb 13 19:29:29 2023 +0000 |
| tree | d6fbfc906139e06823606de0b79fe32b3cdb1d7d | |
| parent | e7b177e69d11e274ea06e303e0770d19f2d7a945 [diff] | |
| parent | 0b9179862f73cc38599b6e8f676dc00071a65557 [diff] |
Merge "RKP spec: fix public key info description" am: bf0ae8a0f0 am: fd313e8f72 am: 0b9179862f Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2430758 Change-Id: Ic733bb52c4e1ce8bacbfd72173fbe72d89ae2143 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/security/rkp/aidl/android/hardware/security/keymint/ProtectedData.aidl b/security/rkp/aidl/android/hardware/security/keymint/ProtectedData.aidl index 57ee8cf..de94264 100644 --- a/security/rkp/aidl/android/hardware/security/keymint/ProtectedData.aidl +++ b/security/rkp/aidl/android/hardware/security/keymint/ProtectedData.aidl
@@ -70,7 +70,7 @@ * ; HKDF. See details on use in ProtectedData comments above. The public key data * ; included in the other field of PartyUInfo / PartyVInfo is encoded as: * ; - a raw 32-byte public key for X25519 - * ; - uncompressed SEC-1 coordinate data (0x04 || x || y) for P-256 + * ; - raw coordinate data (x || y) for P-256 * Context = [ * AlgorithmID : 3 ; AES-GCM 256 * PartyUInfo : [