commit 884371e1e0be7e0f3d5e8ad2b3d13be4715925d2
author Jamie Fox <jamie.fox@arm.com> Mon Jul 24 15:33:08 2023 +0100
committer Jamie Fox <jamie.fox@arm.com> Thu Aug 03 15:08:50 2023 +0100
tree ccad6f65f33432a112c681cd0739448fe105d11f
parent 0013cbda6ef238b3ae855f941b37777d6681dd9d

Measured boot: Support integer versions in shared measurements

When collecting measurements from the shared boot data area, expect the
image version to be passed as a struct of integers. Format the integer
version values into a string before storing them.

Signed-off-by: Jamie Fox <jamie.fox@arm.com>
Change-Id: Ib434f108f4b4b5cced860f5f561a51c084adee9d

partitions/measured_boot/measured_boot.c

diff --git a/partitions/measured_boot/measured_boot.c b/partitions/measured_boot/measured_boot.c
index 5172ad4..e5ac0e4 100644
--- a/partitions/measured_boot/measured_boot.c
+++ b/partitions/measured_boot/measured_boot.c
@@ -18,6 +18,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <stdbool.h>
+#include <stdio.h>
 
 #define TEMP_BUFFER_SIZE (MEASUREMENT_VALUE_SIZE + MEASUREMENT_VALUE_MAX_SIZE)
 
@@ -399,6 +400,8 @@
     uint8_t claim;
     psa_status_t status = PSA_ERROR_GENERIC_ERROR;
     int32_t rc;
+    uint8_t version[VERSION_MAX_SIZE];
+    int version_size;
 
     /* Collect the measurements from the shared data area and store them. */
     rc = tfm_core_get_boot_data(TLV_MAJOR_MBS,
@@ -453,14 +456,25 @@
                 break;
             }
 
+            /* Format the version into a string "major.minor.revision+build" */
+            version_size = snprintf((char *)version, sizeof(version),
+                                    "%u.%u.%u+%u",
+                                    metadata_ptr->sw_version.major,
+                                    metadata_ptr->sw_version.minor,
+                                    metadata_ptr->sw_version.revision,
+                                    metadata_ptr->sw_version.build_num);
+            if (version_size < 0 || version_size >= sizeof(version)) {
+                status = PSA_ERROR_GENERIC_ERROR;
+                break;
+            }
+
             /* Store the measurement and associated metadata. */
             status = measured_boot_extend_measurement(
                     (uint8_t)GET_MBS_SLOT(tlv_entry.tlv_type),
                     metadata_ptr->signer_id,
                     metadata_ptr->signer_id_size,
-                    (const uint8_t*)metadata_ptr->sw_version,
-                    tfm_strnlen(metadata_ptr->sw_version,
-                                sizeof(metadata_ptr->sw_version)),
+                    version,
+                    version_size,
                     metadata_ptr->measurement_type,
                     (const uint8_t*)metadata_ptr->sw_type,
                     tfm_strnlen(metadata_ptr->sw_type,