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

Commit bea97ad0 authored by Alan Stokes's avatar Alan Stokes Committed by Automerger Merge Worker
Browse files

Give a name to the ConfigurationDescriptor. am: 8cbbc15b 

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



Change-Id: I9642991dbed2095b7e6566e142effc42054965f2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0b6455dc 8cbbc15b

security/rkp/aidl/android/hardware/security/keymint/generateCertificateRequestV2.cddl

+8 −6
Original line number Diff line number Diff line
@@ -101,15 +101,17 @@ DiceChainEntryPayload = { ; CWT [RFC8392] 
    -4670545 : bstr,                         ; Code Hash

    ? -4670546 : bstr,                       ; Code Descriptor

    -4670547 : bstr,                         ; Configuration Hash

    -4670548 : bstr .cbor {                  ; Configuration Descriptor

    -4670548 : bstr .cbor ConfigurationDescriptor,

    -4670549 : bstr,                         ; Authority Hash

    ? -4670550 : bstr,                       ; Authority Descriptor

    -4670551 : bstr,                         ; Mode

}



ConfigurationDescriptor = {                  ; Configuration Descriptor

    ? -70002 : tstr,                         ; Component name

    ? -70003 : int / tstr,                   ; Component version

    ? -70004 : null,                         ; Resettable

    ? -70005 : uint,                         ; Security version

    },

    -4670549 : bstr,                         ; Authority Hash

    ? -4670550 : bstr,                       ; Authority Descriptor

    -4670551 : bstr,                         ; Mode

}



; Each entry in the DICE chain is a DiceChainEntryPayload signed by the key from the previous