commit cbded68c27c1f1eb1604a7bfe615bb127e9a2a09
author Maulik Patel <maulik.patel@arm.com> Thu Dec 07 11:50:16 2023 +0000
committer Maulik Patel <maulik.patel@arm.com> Tue Dec 19 10:20:45 2023 +0000
tree 7e197ca5fd57d2f9a4259c2c06dc8158cd1e48ea
parent 83a6b599c860e78d6fd55be351058fdd1b5c7147

DPE: Update CertifyKey to newer spec (v 0.9)

* Returns leaf certificate only for current layer instead of full chain.
* Does not finalises the layer while returning the leaf certificate.

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

partitions/dice_protection_environment/dpe_cmd_decode.c

diff --git a/partitions/dice_protection_environment/dpe_cmd_decode.c b/partitions/dice_protection_environment/dpe_cmd_decode.c
index 935078d..5112063 100644
--- a/partitions/dice_protection_environment/dpe_cmd_decode.c
+++ b/partitions/dice_protection_environment/dpe_cmd_decode.c
@@ -287,8 +287,8 @@
     size_t public_key_size;
     const uint8_t *label;
     size_t label_size;
-    uint8_t certificate_chain_buf[DICE_CERT_CHAIN_SIZE];
-    size_t certificate_chain_actual_size;
+    uint8_t certificate_buf[DICE_CERT_SIZE];
+    size_t certificate_actual_size;
     uint8_t derived_public_key_buf[DPE_ATTEST_PUB_KEY_SIZE];
     size_t derived_public_key_actual_size;
     int new_context_handle;
@@ -328,9 +328,9 @@
 
     dpe_err = certify_key_request(context_handle, retain_context, public_key,
                                   public_key_size, label, label_size,
-                                  certificate_chain_buf,
-                                  sizeof(certificate_chain_buf),
-                                  &certificate_chain_actual_size,
+                                  certificate_buf,
+                                  sizeof(certificate_buf),
+                                  &certificate_actual_size,
                                   derived_public_key_buf,
                                   sizeof(derived_public_key_buf),
                                   &derived_public_key_actual_size,
@@ -349,9 +349,9 @@
      * key implementation. Add it as a byte string so that its decoding can be
      * skipped and the CBOR returned to the caller.
      */
-    QCBOREncode_AddBytesToMapN(encode_ctx, DPE_CERTIFY_KEY_CERTIFICATE_CHAIN,
-                               (UsefulBufC){ certificate_chain_buf,
-                                             certificate_chain_actual_size });
+    QCBOREncode_AddBytesToMapN(encode_ctx, DPE_CERTIFY_KEY_CERTIFICATE,
+                               (UsefulBufC){ certificate_buf,
+                                             certificate_actual_size });
 
     QCBOREncode_AddBytesToMapN(encode_ctx, DPE_CERTIFY_KEY_DERIVED_PUBLIC_KEY,
                                (UsefulBufC){ derived_public_key_buf,