fix(psa): extend measured boot logging

Print all the params of
rss_measured_boot_extend_measurement() to
the console to check parameter healthiness.

Signed-off-by: Tamas Ban <tamas.ban@arm.com>
Change-Id: I072fe5fef72c67e615ab64e06a9e1f6add5e9cfc

diff --git a/lib/psa/measured_boot.c b/lib/psa/measured_boot.c
index 3c54f4750f9e01296fbd49d8fa893d9870ecd2a2..6e9ff78f260c10c228ae38c859932453706ed77f 100644 (file)
--- a/lib/psa/measured_boot.c
+++ b/lib/psa/measured_boot.c
@@ -39,8 +39,10 @@ static void log_measurement(uint8_t index,
                            const uint8_t *signer_id,
                            size_t signer_id_size,
                            const uint8_t *version,     /* string */
-                           uint32_t measurement_algo,
+                           size_t version_size,
                            const uint8_t *sw_type,     /* string */
+                           size_t sw_type_size,
+                           uint32_t measurement_algo,
                            const uint8_t *measurement_value,
                            size_t measurement_value_size,
                            bool lock_measurement)
@@ -49,9 +51,11 @@ static void log_measurement(uint8_t index,
        INFO(" - slot        : %u\n", index);
        INFO(" - signer_id   :");
        print_byte_array(signer_id, signer_id_size);
-       INFO(" - version     : %s\n", version);
+       INFO(" - version     : %s\n",  version);
+       INFO(" - version_size: %zu\n", version_size);
+       INFO(" - sw_type     : %s\n",  sw_type);
+       INFO(" - sw_type_size: %zu\n", sw_type_size);
        INFO(" - algorithm   : %x\n", measurement_algo);
-       INFO(" - sw_type     : %s\n", sw_type);
        INFO(" - measurement :");
        print_byte_array(measurement_value, measurement_value_size);
        INFO(" - locking     : %s\n", lock_measurement ? "true" : "false");
@@ -95,9 +99,9 @@ rss_measured_boot_extend_measurement(uint8_t index,
        }
 
        log_measurement(index, signer_id, signer_id_size,
-                       version, measurement_algo, sw_type,
-                       measurement_value, measurement_value_size,
-                       lock_measurement);
+                       version, version_size, sw_type, sw_type_size,
+                       measurement_algo, measurement_value,
+                       measurement_value_size, lock_measurement);
 
        return psa_call(RSS_MEASURED_BOOT_HANDLE,
                        RSS_MEASURED_BOOT_EXTEND,
@@ -121,9 +125,9 @@ rss_measured_boot_extend_measurement(uint8_t index,
                                     bool lock_measurement)
 {
        log_measurement(index, signer_id, signer_id_size,
-                       version, measurement_algo, sw_type,
-                       measurement_value, measurement_value_size,
-                       lock_measurement);
+                       version, version_size, sw_type, sw_type_size,
+                       measurement_algo, measurement_value,
+                       measurement_value_size, lock_measurement);
 
        return PSA_SUCCESS;
 }