From 8cbbc15bc367183e739989086d52f81637ee475f Mon Sep 17 00:00:00 2001 From: Alan Stokes Date: Fri, 13 Oct 2023 13:42:24 +0000 Subject: [PATCH] Give a name to the ConfigurationDescriptor. Test: N/A Change-Id: Ia2f4198e97a61494ba50e46fd198ee1f1ad44f0d --- .../keymint/generateCertificateRequestV2.cddl | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/security/rkp/aidl/android/hardware/security/keymint/generateCertificateRequestV2.cddl b/security/rkp/aidl/android/hardware/security/keymint/generateCertificateRequestV2.cddl index 15b0442b9f..61404d4758 100644 --- a/security/rkp/aidl/android/hardware/security/keymint/generateCertificateRequestV2.cddl +++ b/security/rkp/aidl/android/hardware/security/keymint/generateCertificateRequestV2.cddl @@ -101,17 +101,19 @@ DiceChainEntryPayload = { ; CWT [RFC8392] -4670545 : bstr, ; Code Hash ? -4670546 : bstr, ; Code Descriptor -4670547 : bstr, ; Configuration Hash - -4670548 : bstr .cbor { ; Configuration Descriptor - ? -70002 : tstr, ; Component name - ? -70003 : int / tstr, ; Component version - ? -70004 : null, ; Resettable - ? -70005 : uint, ; Security version - }, + -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 +} + ; Each entry in the DICE chain is a DiceChainEntryPayload signed by the key from the previous ; entry in the DICE chain array. DiceChainEntry = [ ; COSE_Sign1 (untagged), [RFC9052 s4.2]