Skip to content

Fix for crypto callback unavailable and ECDSA hash type #433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LinuxJedi merged 3 commits into from
Aug 26, 2025
Merged

Fix for crypto callback unavailable and ECDSA hash type #433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4050983
Fix for crypto callback to return CRYPTOCB_UNAVAILABLE when a TPM key…
dgarske Aug 26, 2025
81a5d7e
Revert changes to `WOLFTPM2_USE_SW_ECDHE`
dgarske Aug 26, 2025
29dcfa7
Spelling
dgarske Aug 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions src/tpm2_cryptocb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,10 @@ int wolfTPM2_CryptoDevCb(int devId, wc_CryptoInfo* info, void* ctx)
&& tlsCtx->ecdhKey == NULL
) {
#ifdef DEBUG_WOLFTPM
printf("No crypto callback key pointer set!\n");
printf("No crypto callback TPM key set, "
"fallback to software crypto\n");
#endif
return BAD_FUNC_ARG;
return exit_rc;
}

/* Make sure an ECDH key has been set and curve is supported */
Expand All @@ -205,6 +206,7 @@ int wolfTPM2_CryptoDevCb(int devId, wc_CryptoInfo* info, void* ctx)
}
rc = TPM2_GetTpmCurve(curve_id);
if (rc < 0) {
/* curve not available, so fallback to sw crypto */
return exit_rc;
}
curve_id = rc;
Expand All @@ -215,9 +217,14 @@ int wolfTPM2_CryptoDevCb(int devId, wc_CryptoInfo* info, void* ctx)
if (tlsCtx->ecdhKey == NULL)
#endif
{
/* Create an ECC key for ECDSA - if one isn't already created */
key = (tlsCtx->ecdsaKey != NULL) ?
(WOLFTPM2_KEY*)tlsCtx->ecdsaKey : tlsCtx->eccKey;
if (key == NULL) {
/* fallback to software crypto */
return exit_rc;
}

/* Create an ECC key for ECDSA - if one isn't already created */
if (key->handle.hndl == 0 ||
key->handle.hndl == TPM_RH_NULL
) {
Expand Down
18 changes: 12 additions & 6 deletions src/tpm2_wrap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4132,11 +4132,13 @@ int wolfTPM2_SignHash(WOLFTPM2_DEV* dev, WOLFTPM2_KEY* key,
sigAlg = TPM_ALG_ECDSA;
}
if (hashAlg == 0 || hashAlg == TPM_ALG_NULL) {
if (digestSz == 64)
/* determine hash type based on curve */
int curve_id = pub->parameters.eccDetail.curveID;
if (curve_id == TPM_ECC_NIST_P521)
hashAlg = TPM_ALG_SHA512;
else if (digestSz == 48)
else if (curve_id == TPM_ECC_NIST_P384)
hashAlg = TPM_ALG_SHA384;
else if (digestSz == 32)
else
hashAlg = TPM_ALG_SHA256;
}
}
Expand Down Expand Up @@ -4273,12 +4275,16 @@ int wolfTPM2_VerifyHash_ex(WOLFTPM2_DEV* dev, WOLFTPM2_KEY* key,
int wolfTPM2_VerifyHash(WOLFTPM2_DEV* dev, WOLFTPM2_KEY* key,
const byte* sig, int sigSz, const byte* digest, int digestSz)
{
int curve_id = 0;
int hashAlg = TPM_ALG_NULL;

/* detect hash algorithm based on digest size */
if (digestSz >= TPM_SHA512_DIGEST_SIZE)
/* detect hash algorithm based on key curve */
if (key != NULL) {
curve_id = key->pub.publicArea.parameters.eccDetail.curveID;
}
if (curve_id == TPM_ECC_NIST_P521)
hashAlg = TPM_ALG_SHA512;
else if (digestSz >= TPM_SHA384_DIGEST_SIZE)
else if (curve_id == TPM_ECC_NIST_P384)
hashAlg = TPM_ALG_SHA384;
else
hashAlg = TPM_ALG_SHA256;
Expand Down
Loading