tpm-v2: allow algo name to be conigured for pcr_read and pcr_extend
PATCH 1/1 tpm-v2: allow algo name to be conigured for pcr_read and pcr_extend
For pcr_read and pcr_extend commands allow the digest algo to be specified by an additional argument. If not specified it will default to SHA256 for backwards compatibility.
A follow-on to this could be to extend all PCR banks with the detected algo when the <digest_algo> argument is 'auto'.
--- cmd/tpm-v2.c | 51 +++++++++++++++++++++++++++++++++++------------- include/tpm-v2.h | 17 ++++++++++++++++ lib/tpm-v2.c | 46 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+), 14 deletions(-)
cmd/tpm-v2.c +37 -14
@@ -99,11 +99,20 @@ static int do_tpm2_pcr_extend(struct cmd_tbl *cmdtp, int flag, int argc,struct tpm_chip_priv *priv;u32 index =simple_strtoul (argv[1 ],NULL ,0 );void *digest =map_sysmem (simple_strtoul (argv[2 ],NULL ,0 ),0 ); +int algo_len =TPM2_SHA256_DIGEST_SIZE ; +int algo =TPM2_ALG_SHA256 ;int ret;u32 rc; -if (argc !=3 ) +if (argc <3 || argc >4 )return CMD_RET_USAGE ; +if (argc ==4 ) { + algo =tpm2_algo_len (argv[3 ], &algo_len); +if (algo <0 ) { +printf ("Error: invalid algo\n" ); +return CMD_RET_USAGE ; + } + } ret =get_tpm (&dev);if (ret)
@@ -116,8 +125,12 @@ static int do_tpm2_pcr_extend(struct cmd_tbl *cmdtp, int flag, int argc,if (index >= priv->pcr_count)return -EINVAL ; - rc =tpm2_pcr_extend (dev, index,TPM2_ALG_SHA256 , digest, -TPM2_DIGEST_LEN ); + rc =tpm2_pcr_extend (dev, index, algo, digest, algo_len); +if (!rc) { +printf ("PCR #%u extended with %d byte %s digest\n" , index, + algo_len,tpm2_algo_name (algo)); +print_byte_string (digest, algo_len); + }unmap_sysmem (digest);
@@ -127,6 +140,8 @@ static int do_tpm2_pcr_extend(struct cmd_tbl *cmdtp, int flag, int argc,static int do_tpm_pcr_read (struct cmd_tbl *cmdtp,int flag,int argc,char *const argv[]) { +int algo_len =TPM2_SHA256_DIGEST_SIZE ; +int algo =TPM2_ALG_SHA256 ;struct udevice *dev;struct tpm_chip_priv *priv;u32 index, rc;
@@ -134,8 +149,15 @@ static int do_tpm_pcr_read(struct cmd_tbl *cmdtp, int flag, int argc,void *data;int ret; -if (argc !=3 ) +if (argc <3 || argc >4 )return CMD_RET_USAGE ; +if (argc ==4 ) { + algo =tpm2_algo_len (argv[3 ], &algo_len); +if (algo <0 ) { +printf ("Error: invalid algo\n" ); +return CMD_RET_USAGE ; + } + } ret =get_tpm (&dev);if (ret)
@@ -151,11 +173,12 @@ static int do_tpm_pcr_read(struct cmd_tbl *cmdtp, int flag, int argc, data =map_sysmem (simple_strtoul (argv[2 ],NULL ,0 ),0 ); - rc =tpm2_pcr_read (dev, index, priv->pcr_select_min,TPM2_ALG_SHA256 , - data,TPM2_DIGEST_LEN , &updates); + rc =tpm2_pcr_read (dev, index, priv->pcr_select_min, algo, + data, algo_len, &updates);if (!rc) { -printf ("PCR #%u content (%u known updates):\n" , index, updates); -print_byte_string (data,TPM2_DIGEST_LEN ); +printf ("PCR #%u %s %d byte content (%u known updates):\n" , index, +tpm2_algo_name (algo), algo_len, updates); +print_byte_string (data, algo_len); }unmap_sysmem (data);
@@ -415,14 +438,14 @@ U_BOOT_CMD(tpm2, CONFIG_SYS_MAXARGS, 1, do_tpm, "Issue a TPMv2.x command"," <hierarchy> is one of:\n" " * TPM2_RH_LOCKOUT\n" " * TPM2_RH_PLATFORM\n" -"pcr_extend <pcr> <digest_addr>\n" -" Extend PCR #<pcr> with digest at <digest_addr>.\n" +"pcr_extend <pcr> <digest_addr> [<digest_algo>]\n" +" Extend PCR #<pcr> with digest at <digest_addr> with digest_algo.\n" " <pcr>: index of the PCR\n" -" <digest_addr>: address of a 32-byte SHA256 digest\n" -"pcr_read <pcr> <digest_addr>\n" -" Read PCR #<pcr> to memory address <digest_addr>.\n" +" <digest_addr>: address of digest of digest_algo type (defaults to SHA256)\n" +"pcr_read <pcr> <digest_addr> [<digest_algo>]\n" +" Read PCR #<pcr> to memory address <digest_addr> with <digest_algo>.\n" " <pcr>: index of the PCR\n" -" <digest_addr>: address to store the a 32-byte SHA256 digest\n" +" <digest_addr>: address of digest of digest_algo type (defaults to SHA256)\n" "get_capability <capability> <property> <addr> <count>\n" " Read and display <count> entries indexed by <capability>/<property>.\n" " Values are 4 bytes long and are written at <addr>.\n"
include/tpm-v2.h +17 -0
@@ -965,4 +965,21 @@ u32 tpm2_enable_nvcommits(struct udevice *dev, uint vendor_cmd,*/ u32 tpm2_auto_start (struct udevice *dev); +/** +* tpm2_algo_len() - Return an algo value and length given a algorithm name +* +* @name: algorithm name +* @rwlen: pointer to integer to populate with algorithm length if non-null +* Return: algorithm value +*/ +int tpm2_algo_len (const char *name,int *rwlen); + +/** +* tpm2_algo_len() - Return an algoithm name string +* +* @algo: algorithm value +* Return: algorithm string +*/ +const char *tpm2_algo_name (int algo); +#endif /* __TPM_V2_H */
lib/tpm-v2.c +46 -0
49 lines not on this page · raw message
Signature · 1 line
2.25.1
Hi Tim,
[...]
Quoted 46 lines
include/tpm-v2.h +17
-0+/** +* tpm2_algo_len() - Return an algo value and length given a algorithm name +* +* @name: algorithm name +* @rwlen: pointer to integer to populate with algorithm length if non-null +* Return: algorithm value +*/ +int tpm2_algo_len (const char *name,int *rwlen); + +/** +* tpm2_algo_len() - Return an algoithm name string +* +* @algo: algorithm value +* Return: algorithm string +*/ +const char *tpm2_algo_name (int algo); +#endif /* __TPM_V2_H */ lib/tpm-v2.c +19
-0@@ -1555,3 +1555,49 @@ u32 tpm2_enable_nvcommits(struct udevice *dev, uint vendor_cmd,return 0 ; } + +int tpm2_algo_len (const char *name,int *rwlen) +{ +int algo = -EINVAL ; +int len =0 ; + +if (!strcasecmp ("sha1" , name)) { + algo =TPM2_ALG_SHA1 ; + len =TPM2_SHA1_DIGEST_SIZE ; + }else if (!strcasecmp ("sha256" , name)) { + algo =TPM2_ALG_SHA256 ; + len =TPM2_SHA256_DIGEST_SIZE ; + }else if (!strcasecmp ("sha384" , name)) { + algo =TPM2_ALG_SHA384 ; + len =TPM2_SHA384_DIGEST_SIZE ; + }else if (!strcasecmp ("sha512" , name)) { + algo =TPM2_ALG_SHA512 ; + len =TPM2_SHA512_DIGEST_SIZE ; + }else if (!strcasecmp ("sm3_256" , name)) {
lib/tpm-v2.c u32 tpm2_enable_nvcommits(struct udevice *dev, uint vendor_cmd, · line 1586
Quoted 10 lines
lib/tpm-v2.c +10
-0+ algo =TPM2_ALG_SM3_256 ; + len =TPM2_SM3_256_DIGEST_SIZE ; + } + +if (*rwlen) + *rwlen = len; + +return algo; +} +
We already have tpm2_algorithm_to_len(). Instead of defining a new function, can we convert strings to 'enum tpm2_algorithms'? We can then reuse the existing function.
Quoted 18 lines
lib/tpm-v2.c +17
-1+const char *tpm2_algo_name (int algo) +{ +switch (algo) { +case TPM2_ALG_SHA1 : +return "sha1" ; +case TPM2_ALG_SHA256 : +return "sha256" ; +case TPM2_ALG_SHA384 : +return "sha384" ; +case TPM2_ALG_SHA512 : +return "sha512" ; +case TPM2_ALG_SM3_256 : +return "sm3_256" ; + } + +return "" ; +} --
Quoted 2 lines
2.25.1
Thanks
/Ilias
Quoted 57 lines · Ilias Apalodimas
Hi Tim,
[...]
Quoted 52 lines
include/tpm-v2.h +17
-0+/** +* tpm2_algo_len() - Return an algo value and length given a algorithm name +* +* @name: algorithm name +* @rwlen: pointer to integer to populate with algorithm length if non-null +* Return: algorithm value +*/ +int tpm2_algo_len (const char *name,int *rwlen); + +/** +* tpm2_algo_len() - Return an algoithm name string +* +* @algo: algorithm value +* Return: algorithm string +*/ +const char *tpm2_algo_name (int algo); +#endif /* __TPM_V2_H */ lib/tpm-v2.c +25
-0@@ -1555,3 +1555,49 @@ u32 tpm2_enable_nvcommits(struct udevice *dev, uint vendor_cmd,return 0 ; } + +int tpm2_algo_len (const char *name,int *rwlen) +{ +int algo = -EINVAL ; +int len =0 ; + +if (!strcasecmp ("sha1" , name)) { + algo =TPM2_ALG_SHA1 ; + len =TPM2_SHA1_DIGEST_SIZE ; + }else if (!strcasecmp ("sha256" , name)) { + algo =TPM2_ALG_SHA256 ; + len =TPM2_SHA256_DIGEST_SIZE ; + }else if (!strcasecmp ("sha384" , name)) { + algo =TPM2_ALG_SHA384 ; + len =TPM2_SHA384_DIGEST_SIZE ; + }else if (!strcasecmp ("sha512" , name)) { + algo =TPM2_ALG_SHA512 ; + len =TPM2_SHA512_DIGEST_SIZE ; + }else if (!strcasecmp ("sm3_256" , name)) { + algo =TPM2_ALG_SM3_256 ; + len =TPM2_SM3_256_DIGEST_SIZE ; + } + +if (*rwlen) + *rwlen = len;
Quoted 9 lines
lib/tpm-v2.c u32 tpm2_enable_nvcommits(struct udevice *dev, uint vendor_cmd, · line 1586
Quoted 4 lines
lib/tpm-v2.c +4
-0+ +return algo; +} +We already have
tpm2_algorithm_to_len(). Instead of defining a new function, can we convert strings to 'enumtpm2_algorithms'? We can then reuse the existing function.
Hi Ilias,
Thanks - I didn't see tpm2_algorithm_to_len. Yes, I can use it but I still need to add a new function to turn the name into an algo. I also didn't see tpm2_supported_algorithms; should I only support name-to-algorithm and algorithm-to-name for that subset?
Best Regards,
Tim
Quoted 23 lines
Quoted 18 lines
lib/tpm-v2.c +17
-1+const char *tpm2_algo_name (int algo) +{ +switch (algo) { +case TPM2_ALG_SHA1 : +return "sha1" ; +case TPM2_ALG_SHA256 : +return "sha256" ; +case TPM2_ALG_SHA384 : +return "sha384" ; +case TPM2_ALG_SHA512 : +return "sha512" ; +case TPM2_ALG_SM3_256 : +return "sm3_256" ; + } + +return "" ; +} --Quoted 2 lines
2.25.1
Thanks
/Ilias
Quoted 70 lines · Tim Harvey
Quoted 57 lines · Ilias Apalodimas
Hi Tim,
[...]
Quoted 52 lines
include/tpm-v2.h +17
-0+/** +* tpm2_algo_len() - Return an algo value and length given a algorithm name +* +* @name: algorithm name +* @rwlen: pointer to integer to populate with algorithm length if non-null +* Return: algorithm value +*/ +int tpm2_algo_len (const char *name,int *rwlen); + +/** +* tpm2_algo_len() - Return an algoithm name string +* +* @algo: algorithm value +* Return: algorithm string +*/ +const char *tpm2_algo_name (int algo); +#endif /* __TPM_V2_H */ lib/tpm-v2.c +25
-0@@ -1555,3 +1555,49 @@ u32 tpm2_enable_nvcommits(struct udevice *dev, uint vendor_cmd,return 0 ; } + +int tpm2_algo_len (const char *name,int *rwlen) +{ +int algo = -EINVAL ; +int len =0 ; + +if (!strcasecmp ("sha1" , name)) { + algo =TPM2_ALG_SHA1 ; + len =TPM2_SHA1_DIGEST_SIZE ; + }else if (!strcasecmp ("sha256" , name)) { + algo =TPM2_ALG_SHA256 ; + len =TPM2_SHA256_DIGEST_SIZE ; + }else if (!strcasecmp ("sha384" , name)) { + algo =TPM2_ALG_SHA384 ; + len =TPM2_SHA384_DIGEST_SIZE ; + }else if (!strcasecmp ("sha512" , name)) { + algo =TPM2_ALG_SHA512 ; + len =TPM2_SHA512_DIGEST_SIZE ; + }else if (!strcasecmp ("sm3_256" , name)) { + algo =TPM2_ALG_SM3_256 ; + len =TPM2_SM3_256_DIGEST_SIZE ; + } + +if (*rwlen) + *rwlen = len;Quoted 9 lines
lib/tpm-v2.c u32 tpm2_enable_nvcommits(struct udevice *dev, uint vendor_cmd, · line 1586
Quoted 4 lines
lib/tpm-v2.c +4
-0+ +return algo; +} +We already have
tpm2_algorithm_to_len(). Instead of defining a new function, can we convert strings to 'enumtpm2_algorithms'? We can then reuse the existing function.
Quoted 4 lines
Hi Ilias,
Thanks - I didn't see
tpm2_algorithm_to_len. Yes, I can use it but I still need to add a new function to turn the name into an algo.
Yep, that's fine,
Quoted 4 lines
I also
didn't seetpm2_supported_algorithms; should I only support name-to-algorithm and algorithm-to-name for that subset?
Yea, that would be good, we can at least have a reference of what we currently support.
Cheers
/Ilias
Quoted 27 lines
Best Regards,
Tim
Quoted 23 lines
Quoted 18 lines
lib/tpm-v2.c +17
-1+const char *tpm2_algo_name (int algo) +{ +switch (algo) { +case TPM2_ALG_SHA1 : +return "sha1" ; +case TPM2_ALG_SHA256 : +return "sha256" ; +case TPM2_ALG_SHA384 : +return "sha384" ; +case TPM2_ALG_SHA512 : +return "sha512" ; +case TPM2_ALG_SM3_256 : +return "sm3_256" ; + } + +return "" ; +} --Quoted 2 lines
2.25.1
Thanks
/Ilias