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

Fix ecc-default-curve-p384 CI: P256-sized buffer overflow + scope to make check 

test_wolfTPM2_LoadEccPublicKey_Ex harvested SRK X/Y coordinates into
byte[32] buffers and reloaded them hardcoding TPM_ECC_NIST_P256. Under
-DWOLFTPM2_ECC_DEFAULT_CURVE=TPM_ECC_NIST_P384 the SRK is P384, so the
48-byte coordinates overflowed the 32-byte stack buffers (FORTIFY abort,
the failing CI job). Size the buffers to MAX_ECC_KEY_BYTES and reload
using the SRK's actual curve/nameAlg so the test is curve-agnostic.

Scope the ecc-default-curve-p384 job to 'make check': unit.test exercises
the SRK/AIK -> P384/SHA384 upgrade and explicit-curve/ECDHE honoring
end-to-end. run_examples.sh is omitted because several demos (pcr/quote,
boot/secure_rot, native_test) hardcode SHA256 for the ECC sign/quote
scheme - a demo limitation, not a library issue.
pull/519/head
David Garske 2026-06-09 11:09:06 -07:00
parent 4590e79e14
commit 01301c40d0
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/make-test-swtpm.yml vendored
View File

@ -278,13 +278,17 @@ jobs:
wolftpm_cflags: "-DWOLFTPM2_USE_SW_ECDHE"
test_command: "make check && WOLFSSL_PATH=./wolfssl ./examples/run_examples.sh"
# ECC default curve override (P384) - exercises the upgrade path
# (SRK/AIK -> P384) and confirms explicit-curve/ECDHE callers still
# use their negotiated curve.
# ECC default curve override (P384). make check (unit.test) exercises
# the SRK/AIK -> P384/SHA384 upgrade and confirms explicit-curve/ECDHE
# callers keep their requested curve, end-to-end against the simulator.
# run_examples.sh is intentionally omitted: several demos (pcr/quote,
# boot/secure_rot, native_test) hardcode SHA256 for the ECC sign/quote
# scheme and are not curve-agnostic - that is a demo limitation, not a
# library issue.
- name: ecc-default-curve-p384
wolftpm_config: "--enable-swtpm --disable-fwtpm"
wolftpm_cflags: "-DWOLFTPM2_ECC_DEFAULT_CURVE=TPM_ECC_NIST_P384"
test_command: "make check && WOLFSSL_PATH=./wolfssl ./examples/run_examples.sh"
test_command: "make check"
# No ECC
- name: no-ecc

20
tests/unit_tests.c
View File

@ -2268,9 +2268,11 @@ static void test_wolfTPM2_LoadEccPublicKey_Ex(void)
WOLFTPM2_KEY srk;
WOLFTPM2_KEY peer;
TPMT_PUBLIC pub;
byte xBuf[32];
byte yBuf[32];
byte xBuf[MAX_ECC_KEY_BYTES];
byte yBuf[MAX_ECC_KEY_BYTES];
word32 xSz, ySz;
TPM_ECC_CURVE curve;
TPM_ALG_ID nameAlg;
XMEMSET(&dev, 0, sizeof(dev));
XMEMSET(&srk, 0, sizeof(srk));
@ -2285,24 +2287,30 @@ static void test_wolfTPM2_LoadEccPublicKey_Ex(void)
* does not get TPM_RC_OBJECT_MEMORY on a busy simulator. */
(void)wolfTPM2_UnloadHandles_AllTransient(&dev);
/* Create an ECC SRK to harvest valid P-256 X/Y coordinates from. */
/* Create an ECC SRK to harvest valid X/Y coordinates from. The SRK follows
* WOLFTPM2_ECC_DEFAULT_CURVE, so use its actual curve/nameAlg (not a
* hardcoded P256) and size the buffers for any curve. */
XMEMSET(&pub, 0, sizeof(pub));
rc = wolfTPM2_GetKeyTemplate_ECC_SRK(&pub);
AssertIntEQ(rc, TPM_RC_SUCCESS);
rc = wolfTPM2_CreatePrimaryKey(&dev, &srk, TPM_RH_OWNER, &pub, NULL, 0);
AssertIntEQ(rc, TPM_RC_SUCCESS);
curve = srk.pub.publicArea.parameters.eccDetail.curveID;
nameAlg = srk.pub.publicArea.nameAlg;
xSz = srk.pub.publicArea.unique.ecc.x.size;
ySz = srk.pub.publicArea.unique.ecc.y.size;
AssertIntGT(xSz, 0);
AssertIntGT(ySz, 0);
AssertIntLE(xSz, (word32)sizeof(xBuf));
AssertIntLE(ySz, (word32)sizeof(yBuf));
XMEMCPY(xBuf, srk.pub.publicArea.unique.ecc.x.buffer, xSz);
XMEMCPY(yBuf, srk.pub.publicArea.unique.ecc.y.buffer, ySz);
/* Load same coordinates as a peer ECDH key with the decrypt attribute */
rc = wolfTPM2_LoadEccPublicKey_ex(&dev, &peer, TPM_ECC_NIST_P256,
rc = wolfTPM2_LoadEccPublicKey_ex(&dev, &peer, curve,
xBuf, xSz, yBuf, ySz,
TPM_ALG_ECDH, TPM_ALG_SHA256,
TPM_ALG_ECDH, nameAlg,
TPMA_OBJECT_decrypt | TPMA_OBJECT_userWithAuth | TPMA_OBJECT_noDA);
AssertIntEQ(rc, TPM_RC_SUCCESS);
AssertIntEQ(peer.pub.publicArea.parameters.eccDetail.scheme.scheme,
@ -2315,7 +2323,7 @@ static void test_wolfTPM2_LoadEccPublicKey_Ex(void)
/* Legacy wolfTPM2_LoadEccPublicKey: still defaults to ECDSA + sign */
XMEMSET(&peer, 0, sizeof(peer));
rc = wolfTPM2_LoadEccPublicKey(&dev, &peer, TPM_ECC_NIST_P256,
rc = wolfTPM2_LoadEccPublicKey(&dev, &peer, curve,
xBuf, xSz, yBuf, ySz);
AssertIntEQ(rc, TPM_RC_SUCCESS);
AssertIntEQ(peer.pub.publicArea.parameters.eccDetail.scheme.scheme,