WolfSSL
/
wolfTPM
mirror of https://github.com/wolfSSL/wolfTPM.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Improve crypto callback key gen hash algorithm selection.

pull/428/head
David Garske 2025-07-23 13:33:37 -07:00
parent 679020dd70
commit 541a85ca5f
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/wrap/wrap_test.c
View File

@ -124,6 +124,8 @@ int TPM2_Wrapper_TestArgs(void* userCtx, int argc, char *argv[])
TPM_ALG_ID paramEncAlg = TPM_ALG_NULL;
WOLFTPM2_SESSION tpmSession;
XMEMSET(&rsaKey, 0, sizeof(rsaKey));
XMEMSET(&eccKey, 0, sizeof(eccKey));
XMEMSET(&aesKey, 0, sizeof(aesKey));
XMEMSET(&publicKey, 0, sizeof(publicKey));
#ifndef WOLFTPM2_NO_WOLFCRYPT
@ -172,11 +174,9 @@ int TPM2_Wrapper_TestArgs(void* userCtx, int argc, char *argv[])
/* Setup the wolf crypto device callback */
XMEMSET(&tpmCtx, 0, sizeof(tpmCtx));
#ifndef NO_RSA
XMEMSET(&rsaKey, 0, sizeof(rsaKey));
tpmCtx.rsaKey = &rsaKey;
#endif
#ifdef HAVE_ECC
XMEMSET(&eccKey, 0, sizeof(eccKey));
tpmCtx.eccKey = &eccKey;
#endif
tpmCtx.storageKey = &storageKey;

23
src/tpm2_cryptocb.c
View File

@ -220,23 +220,24 @@ int wolfTPM2_CryptoDevCb(int devId, wc_CryptoInfo* info, void* ctx)
key->handle.hndl == TPM_RH_NULL
) {
TPMT_PUBLIC publicTemplate;
XMEMSET(&publicTemplate, 0, sizeof(publicTemplate));
TPMI_ALG_HASH hashAlg;
rc = wolfTPM2_GetKeyTemplate_ECC(&publicTemplate,
if (curve_id == TPM_ECC_NIST_P521)
hashAlg = TPM_ALG_SHA512;
else if (curve_id == TPM_ECC_NIST_P384)
hashAlg = TPM_ALG_SHA384;
else
hashAlg = TPM_ALG_SHA256;
XMEMSET(&publicTemplate, 0, sizeof(publicTemplate));
rc = wolfTPM2_GetKeyTemplate_ECC_ex(&publicTemplate, hashAlg,
TPMA_OBJECT_sensitiveDataOrigin | TPMA_OBJECT_userWithAuth |
TPMA_OBJECT_sign | TPMA_OBJECT_noDA,
curve_id, TPM_ALG_ECDSA);
curve_id, TPM_ALG_ECDSA, hashAlg);
if (rc == 0) {
if (curve_id == TPM_ECC_NIST_P521)
publicTemplate.nameAlg = TPM_ALG_SHA512;
else if (curve_id == TPM_ECC_NIST_P384)
publicTemplate.nameAlg = TPM_ALG_SHA384;
else
publicTemplate.nameAlg = TPM_ALG_SHA256;
if (tlsCtx->ecdsaKey != NULL) {
/* Use create key and load key directly instead to make
* sure the private portion is populated */
* sure the private portion is populated */
rc = wolfTPM2_CreateKey(tlsCtx->dev, tlsCtx->ecdsaKey,
&tlsCtx->storageKey->handle, &publicTemplate,
(byte*)key->handle.auth.buffer,