diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-03-22 17:41:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-22 17:41:54 +0000 |
| commit | 0286ec569929c8b12ee519f2286c7b33dfa6b8e8 (patch) | |
| tree | 1bf725d2526cbdb0d006dbf628efcb81e71e1da4 /security | |
| parent | 4803336d434c4c9c84462db84357b1745463300a (diff) | |
| parent | 08835aaa3df79d75fa06e88dd29e8851cfba988d (diff) | |
Merge "Fix CDDL for signatures." am: 1edd38d6ee am: 3303e97603 am: 08835aaa3d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2036743
Change-Id: Iaf829618dc93488ac3db71e6c7bab37830295ea7
Diffstat (limited to 'security')
| -rw-r--r-- | security/keymint/aidl/android/hardware/security/keymint/ProtectedData.aidl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/security/keymint/aidl/android/hardware/security/keymint/ProtectedData.aidl b/security/keymint/aidl/android/hardware/security/keymint/ProtectedData.aidl index a14fc88804..50244004fb 100644 --- a/security/keymint/aidl/android/hardware/security/keymint/ProtectedData.aidl +++ b/security/keymint/aidl/android/hardware/security/keymint/ProtectedData.aidl @@ -92,8 +92,8 @@ parcelable ProtectedData { * }, * {}, // Unprotected params * bstr .size 32, // MAC key - * bstr PureEd25519(KM_priv, .cbor SignedMac_structure) / - * ECDSA(KM_priv, bstr .cbor SignedMac_structure) + * bstr // PureEd25519(KM_priv, bstr .cbor SignedMac_structure) / + * // ECDSA(KM_priv, bstr .cbor SignedMac_structure) * ] * * SignedMac_structure = [ @@ -144,8 +144,8 @@ parcelable ProtectedData { * }, * unprotected: {}, * payload: bstr .cbor BccPayload, - * signature: bstr .cbor PureEd25519(SigningKey, bstr .cbor BccEntryInput) / - * bstr .cbor ECDSA(SigningKey, bstr .cbor BccEntryInput) + * signature: bstr // PureEd25519(SigningKey, bstr .cbor BccEntryInput) / + * // ECDSA(SigningKey, bstr .cbor BccEntryInput) * // See RFC 8032 for details of how to encode the signature value for Ed25519. * ] * |