Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3303e976 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix CDDL for signatures." am: 1edd38d6 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2036743

Change-Id: Id2271575300572e8b0564c812d45773f38460798
parents 1f0d75f1 1edd38d6

security/keymint/aidl/android/hardware/security/keymint/ProtectedData.aidl

+4 −4
Original line number Diff line number Diff line
@@ -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.

     *     ]

     *