Skip to content

Fix for TPM2_VerifySignature not using the correct hash algorithm #432

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
embhorn merged 3 commits into from
Aug 25, 2025
Merged

Fix for TPM2_VerifySignature not using the correct hash algorithm #432

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
1d1a0bd
Fix for TPM2_VerifySignature not using the correct hash algorithm (ZD…
dgarske Aug 22, 2025
5604e3d
Add test case
dgarske Aug 25, 2025
3630330
Fix spelling
dgarske Aug 25, 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
18 changes: 13 additions & 5 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,12 +264,13 @@ fi


# STM ST33 Support
AC_ARG_ENABLE([st33],,
AC_ARG_ENABLE([st33],
[AS_HELP_STRING([--enable-st33],[Enable ST ST33 TPM Support (default: disabled)])],
[ ENABLED_ST33=$enableval ],
[ ENABLED_ST33=no ]
)
AC_ARG_ENABLE([st],
[AS_HELP_STRING([--enable-st],[Enable ST ST33 TPM Support (default: disabled)])],
[AS_HELP_STRING([--enable-st],[Enable ST TPM Support (default: disabled)])],
[ ENABLED_ST=$enableval ],
[ ENABLED_ST=no ]
)
Expand Down Expand Up @@ -307,7 +308,7 @@ then
AM_CFLAGS="$AM_CFLAGS -DWOLFTPM_NUVOTON"
fi

# Infineon SLB9670/SLB9672
# Infineon SLB9670/SLB9672/SLB9673
AC_ARG_ENABLE([infineon],
[AS_HELP_STRING([--enable-infineon],[Enable Infineon SLB9670/SLB9672 TPM Support (default: disabled)])],
[ ENABLED_INFINEON=$enableval ],
Expand All @@ -319,7 +320,13 @@ then
then
AM_CFLAGS="$AM_CFLAGS -DWOLFTPM_SLB9670"
else
AM_CFLAGS="$AM_CFLAGS -DWOLFTPM_SLB9672"
if test "x$ENABLED_INFINEON" = "xslb9673"
then
enable_i2c=yes
AM_CFLAGS="$AM_CFLAGS -DWOLFTPM_SLB9673"
else
AM_CFLAGS="$AM_CFLAGS -DWOLFTPM_SLB9672"
fi
fi
fi

Expand Down Expand Up @@ -375,7 +382,8 @@ AC_ARG_ENABLE([autodetect],
if test "x$ENABLED_AUTODETECT" = "xtest"
then
# If a module hasn't been selected then enable auto-detection
if test "x$ENABLED_INFINEON" = "xno" && test "x$ENABLED_MCHP" = "xno" && test "x$ENABLED_ST33" = "xno" && test "x$ENABLED_NUVOTON" = "xno"
if test "x$ENABLED_INFINEON" = "xno" && test "x$ENABLED_MCHP" = "xno" && test "x$ENABLED_MICROCHIP" = "xno" && \
test "x$ENABLED_ST" = "xno" && test "x$ENABLED_ST33" = "xno" && test "x$ENABLED_NUVOTON" = "xno"
then
ENABLED_AUTODETECT=yes
fi
Expand Down
10 changes: 7 additions & 3 deletions examples/run_examples.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ run_tpm_tls_client() { # Usage: run_tpm_tls_client [ecc/rsa] [tpmargs] [tlsversi
[ $RESULT -ne 0 ] && echo -e "tpm tls client $1 $2 failed! $RESULT" && exit 1
}

run_tpm_tls_server() { # Usage: run_tpm_tls_server [ecc/rsa] [tpmargs] [tlsversion]
run_tpm_tls_server() { # Usage: run_tpm_tls_server [ecc/rsa] [tpmargs] [tlsversion] [extraargs]
echo -e "TLS test (TPM as server) $1 $2 $3"
generate_port

Expand All @@ -433,8 +433,8 @@ run_tpm_tls_server() { # Usage: run_tpm_tls_server [ecc/rsa] [tpmargs] [tlsversi
pushd $WOLFSSL_PATH >> $TPMPWD/run.out 2>&1
sleep 0.1

echo -e "./examples/client/client -v $3 -p $port -w -g -A ./certs/tpm-ca-$1-cert.pem"
./examples/client/client -p $port -w -g -A ./certs/tpm-ca-$1-cert.pem >> $TPMPWD/run.out 2>&1
echo -e "./examples/client/client -v $3 -p $port -w -g -A ./certs/tpm-ca-$1-cert.pem $4"
./examples/client/client -p $port -w -g -A ./certs/tpm-ca-$1-cert.pem $4 >> $TPMPWD/run.out 2>&1
RESULT=$?
[ $RESULT -ne 0 ] && echo -e "tls client $1 $2 failed! $RESULT" && exit 1
popd >> $TPMPWD/run.out 2>&1
Expand Down Expand Up @@ -480,6 +480,8 @@ if [ $WOLFCRYPT_ENABLE -eq 1 ] && [ $WOLFCRYPT_DEFAULT -eq 0 ] && [ $NO_FILESYST
run_tpm_tls_server "ecc" "-aes" "3"
run_tpm_tls_server "ecc" "" "4"
run_tpm_tls_server "ecc" "-aes" "4"
run_tpm_tls_server "ecc" "" "4" "./certs/client-ecc384-key.pem -c ./certs/client-ecc384-cert.pem"
run_tpm_tls_server "ecc" "-aes" "4" "./certs/client-ecc384-key.pem -c ./certs/client-ecc384-cert.pem"
fi

# TLS client/server ECC TLS v1.2 and v1.3 PK callbacks
Expand All @@ -493,6 +495,8 @@ if [ $WOLFCRYPT_ENABLE -eq 1 ] && [ $WOLFCRYPT_DEFAULT -eq 0 ] && [ $NO_FILESYST
run_tpm_tls_server "ecc" "-pk -aes" "3"
run_tpm_tls_server "ecc" "-pk" "4"
run_tpm_tls_server "ecc" "-pk -aes" "4"
run_tpm_tls_server "ecc" "-pk" "4" "./certs/client-ecc384-key.pem -c ./certs/client-ecc384-cert.pem"
run_tpm_tls_server "ecc" "-pk -aes" "4" "./certs/client-ecc384-key.pem -c ./certs/client-ecc384-cert.pem"
fi
fi
fi
Expand Down
12 changes: 11 additions & 1 deletion src/tpm2_wrap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4273,8 +4273,18 @@ 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 hashAlg = TPM_ALG_NULL;

/* detect hash algorithm based on digest size */
if (digestSz >= TPM_SHA512_DIGEST_SIZE)
hashAlg = TPM_ALG_SHA512;
else if (digestSz >= TPM_SHA384_DIGEST_SIZE)
hashAlg = TPM_ALG_SHA384;
else
hashAlg = TPM_ALG_SHA256;

return wolfTPM2_VerifyHashTicket(dev, key, sig, sigSz, digest, digestSz,
TPM_ALG_NULL, WOLFTPM2_WRAP_DIGEST, NULL);
TPM_ALG_NULL, hashAlg, NULL);
}

/* Generate ECC key-pair with NULL hierarchy and load (populates handle) */
Expand Down
Loading