Skip to content

Fix tls ecdh curve mismatch (wolfTPM build test CI failures) #473

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
aidangarske merged 1 commit into from
Mar 21, 2026
+18 −4
Merged

Fix tls ecdh curve mismatch (wolfTPM build test CI failures) #473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions examples/run_examples.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ run_tpm_tls_client() { # Usage: run_tpm_tls_client [ecc/rsa] [tpmargs] [tlsversi
generate_port
pushd $WOLFSSL_PATH >> $TPMPWD/run.out 2>&1
echo -e "./examples/server/server -v $3 -p $port -w -g -A ./certs/tpm-ca-$1-cert.pem"
./examples/server/server -p $port -w -g -A ./certs/tpm-ca-$1-cert.pem >> $TPMPWD/run.out 2>&1 &
./examples/server/server -v $3 -p $port -w -g -A ./certs/tpm-ca-$1-cert.pem >> $TPMPWD/run.out 2>&1 &
RESULT=$?
[ $RESULT -ne 0 ] && echo -e "tls server $1 $2 failed! $RESULT" && exit 1
popd >> $TPMPWD/run.out 2>&1
Expand All @@ -431,10 +431,10 @@ run_tpm_tls_server() { # Usage: run_tpm_tls_server [ecc/rsa] [tpmargs] [tlsversi
RESULT=$?
[ $RESULT -ne 0 ] && echo -e "tpm tls server $1 $2 failed! $RESULT" && exit 1
pushd $WOLFSSL_PATH >> $TPMPWD/run.out 2>&1
sleep 0.1
sleep 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
./examples/client/client -v $3 -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
16 changes: 15 additions & 1 deletion src/tpm2_cryptocb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,22 @@ int wolfTPM2_CryptoDevCb(int devId, wc_CryptoInfo* info, void* ctx)
}
#ifndef WOLFTPM2_USE_SW_ECDHE
else {
/* Generate ephemeral key - if one isn't already created */
/* Generate ephemeral key - if one isn't already created
* or if the curve has changed (e.g. TLS 1.3 key share
* negotiation may generate a key for one curve, then
* fall back to a different curve) */
key = tlsCtx->ecdhKey;
if (key->handle.hndl != 0 &&
key->handle.hndl != TPM_RH_NULL &&
(int)key->pub.publicArea.parameters.eccDetail.curveID
!= curve_id) {
/* curve changed, release old key */
rc = wolfTPM2_UnloadHandle(tlsCtx->dev,
&key->handle);
if (rc != 0) {
return rc;
}
}
if (key->handle.hndl == 0 ||
key->handle.hndl == TPM_RH_NULL) {
rc = wolfTPM2_ECDHGenKey(tlsCtx->dev, tlsCtx->ecdhKey,
Expand Down
Loading