From 7c3f05ad51e4bc23dd4f411f28968f1d8f43099c Mon Sep 17 00:00:00 2001 From: Heiko Schocher Date: Tue, 18 Nov 2025 05:30:41 +0100 Subject: [PATCH] tpm2: add sm3 256 hash support add sm3 256 hash support, so TPM2 chips which report 5 pcrs with sm3 hash do not fail with: u-boot=> tpm2 autostart tpm2_get_pcr_info: too many pcrs: 5 Error: -90 Signed-off-by: Heiko Schocher --- cmd/tpm-v2.c | 1 + include/tpm-v2.h | 12 ++++++++++++ lib/efi_loader/efi_tcg2.c | 3 +++ lib/tpm-v2.c | 4 ++-- lib/tpm_tcg2.c | 9 +++++++++ 5 files changed, 27 insertions(+), 2 deletions(-) diff --git a/cmd/tpm-v2.c b/cmd/tpm-v2.c index 346e21d27bb..847b2691581 100644 --- a/cmd/tpm-v2.c +++ b/cmd/tpm-v2.c @@ -589,6 +589,7 @@ U_BOOT_CMD(tpm2, CONFIG_SYS_MAXARGS, 1, do_tpm, "Issue a TPMv2.x command", " * sha256\n" " * sha384\n" " * sha512\n" +" * sm3_256\n" " is one of:\n" " * on - Select all available PCRs associated with the specified\n" " algorithm (bank)\n" diff --git a/include/tpm-v2.h b/include/tpm-v2.h index f3eb2ef5643..a776d24d71f 100644 --- a/include/tpm-v2.h +++ b/include/tpm-v2.h @@ -345,6 +345,18 @@ static const struct digest_info hash_algo_list[] = { false, #endif }, + { + "sm3_256", + TPM2_ALG_SM3_256, + TCG2_BOOT_HASH_ALG_SM3_256, + TPM2_SM3_256_DIGEST_SIZE, +#if IS_ENABLED(CONFIG_SM3) + true, +#else + false, +#endif + }, + }; /* NV index attributes */ diff --git a/lib/efi_loader/efi_tcg2.c b/lib/efi_loader/efi_tcg2.c index 1832eeb5dce..bdf78897d47 100644 --- a/lib/efi_loader/efi_tcg2.c +++ b/lib/efi_loader/efi_tcg2.c @@ -430,6 +430,9 @@ static efi_status_t tcg2_hash_pe_image(void *efi, u64 efi_size, case TPM2_ALG_SHA512: hash_calculate("sha512", regs->reg, regs->num, hash); break; + case TPM2_ALG_SM3_256: + hash_calculate("sm3_256", regs->reg, regs->num, hash); + break; default: continue; } diff --git a/lib/tpm-v2.c b/lib/tpm-v2.c index 5b21c57ae42..f443b738f82 100644 --- a/lib/tpm-v2.c +++ b/lib/tpm-v2.c @@ -686,10 +686,10 @@ int tpm2_get_pcr_info(struct udevice *dev, struct tpml_pcr_selection *pcrs) pcrs->count = get_unaligned_be32(response); /* - * We only support 4 algorithms for now so check against that + * check against the supported algorithms in hash_algo_list, * instead of TPM2_NUM_PCR_BANKS */ - if (pcrs->count > 4 || pcrs->count < 1) { + if (pcrs->count > ARRAY_SIZE(hash_algo_list) || pcrs->count < 1) { printf("%s: too many pcrs: %u\n", __func__, pcrs->count); return -EMSGSIZE; } diff --git a/lib/tpm_tcg2.c b/lib/tpm_tcg2.c index c314b401d0b..d41228f75a9 100644 --- a/lib/tpm_tcg2.c +++ b/lib/tpm_tcg2.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -143,6 +144,12 @@ int tcg2_create_digest(struct udevice *dev, const u8 *input, u32 length, sha512_finish(&ctx_512, final); len = TPM2_SHA512_DIGEST_SIZE; break; +#endif +#if IS_ENABLED(CONFIG_SM3) + case TPM2_ALG_SM3_256: + sm3_hash(input, length, final); + len = TPM2_SM3_256_DIGEST_SIZE; + break; #endif default: printf("%s: unsupported algorithm %x\n", __func__, @@ -319,6 +326,7 @@ static int tcg2_replay_eventlog(struct tcg2_event_log *elog, case TPM2_ALG_SHA256: case TPM2_ALG_SHA384: case TPM2_ALG_SHA512: + case TPM2_ALG_SM3_256: len = tpm2_algorithm_to_len(algo); break; default: @@ -431,6 +439,7 @@ static int tcg2_log_parse(struct udevice *dev, struct tcg2_event_log *elog, case TPM2_ALG_SHA256: case TPM2_ALG_SHA384: case TPM2_ALG_SHA512: + case TPM2_ALG_SM3_256: len = get_unaligned_le16(&event->digest_sizes[i].digest_size); if (tpm2_algorithm_to_len(algo) != len) { log_err("EventLog invalid algorithm length\n"); -- 2.47.3