efi_loader: refactor efi_append_scrtm_version()

Refactor efi_append_scrtm_version() to use common
function for adding eventlog and extending PCR.

Signed-off-by: Masahisa Kojima <masahisa.kojima@linaro.org>

diff --git a/lib/efi_loader/efi_tcg2.c b/lib/efi_loader/efi_tcg2.c
index c6f2e48..35e69b9 100644 (file)
--- a/lib/efi_loader/efi_tcg2.c
+++ b/lib/efi_loader/efi_tcg2.c
@@ -1321,23 +1321,11 @@ out:
  */
 static efi_status_t efi_append_scrtm_version(struct udevice *dev)
 {
-       struct tpml_digest_values digest_list;
        u8 ver[] = U_BOOT_VERSION_STRING;
-       const int pcr_index = 0;
        efi_status_t ret;
 
-       ret = tcg2_create_digest(ver, sizeof(ver), &digest_list);
-       if (ret != EFI_SUCCESS)
-               goto out;
+       ret = tcg2_measure_event(dev, 0, EV_S_CRTM_VERSION, sizeof(ver), ver);
 
-       ret = tcg2_pcr_extend(dev, pcr_index, &digest_list);
-       if (ret != EFI_SUCCESS)
-               goto out;
-
-       ret = tcg2_agile_log_append(pcr_index, EV_S_CRTM_VERSION, &digest_list,
-                                   sizeof(ver), ver);
-
-out:
        return ret;
 }