commit 87c47ce727fe6015e271b61a66f5b498b0f4e654
author Maulik Patel <maulik.patel@arm.com> Mon Apr 22 13:30:56 2024 +0100
committer Maulik Patel <maulik.patel@arm.com> Mon Apr 29 11:23:31 2024 +0100
tree c902a76445d4474c921d1f6d184aa67253682bb1
parent 7daae9e35b5ea6bc1c52b5096ccd85f3504947bb

DPE: Do not use DPE_ROT_LAYER_IDX for creating certificate

Signed-off-by: Maulik Patel <maulik.patel@arm.com>
Change-Id: Ibfed56bdec2e338a5fe1f0a2266d146ab7cf919c

partitions/dice_protection_environment/dpe_certificate.c

diff --git a/partitions/dice_protection_environment/dpe_certificate.c b/partitions/dice_protection_environment/dpe_certificate.c
index 629f1cf..956119f 100644
--- a/partitions/dice_protection_environment/dpe_certificate.c
+++ b/partitions/dice_protection_environment/dpe_certificate.c
@@ -372,13 +372,13 @@
 }
 
 static dpe_error_t add_issuer_claim(QCBOREncodeContext *cbor_enc_ctx,
-                                    uint16_t layer_idx,
+                                    const struct layer_context_t *layer_ctx,
                                     psa_key_id_t root_attest_key_id,
                                     const struct layer_context_t *parent_layer_ctx)
 {
     uint8_t rot_cdi_id[DICE_ID_SIZE];
 
-    if (layer_idx == DPE_ROT_LAYER_IDX) {
+    if (layer_ctx->is_rot_layer) {
         /* For the RoT layer, issuer id is derived from the root attestation key */
         if (derive_cdi_id(root_attest_key_id, rot_cdi_id,
                           sizeof(rot_cdi_id)) != PSA_SUCCESS) {
@@ -421,7 +421,7 @@
     /* The RoT layer certificate is signed by the provisioned attestation key,
      * all other layers are signed by the parent layer's attestation key.
      */
-    if (layer_idx == DPE_ROT_LAYER_IDX) {
+    if (layer_ctx->is_rot_layer) {
         attest_key_id = dpe_plat_get_root_attest_key_id();
     } else {
         attest_key_id = parent_layer_ctx->data.attest_key_id;
@@ -439,7 +439,7 @@
 
     /* Add all the required claims */
     /* Add issuer/authority claim */
-    err = add_issuer_claim(cbor_enc_ctx, layer_idx, attest_key_id, parent_layer_ctx);
+    err = add_issuer_claim(cbor_enc_ctx, layer_ctx, attest_key_id, parent_layer_ctx);
     if (err != DPE_NO_ERROR) {
         return err;
     }