Skip to content

tpm2: Implement own function for ECC key size checking #556

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
stefanberger merged 1 commit into from
Feb 22, 2026
+72 −35
Merged

tpm2: Implement own function for ECC key size checking #556

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
49 changes: 42 additions & 7 deletions src/tpm2/RuntimeAlgorithm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,13 +534,13 @@ RuntimeAlgorithmCheckEnabled(struct RuntimeAlgorithm *RuntimeAlgorithm,
* it needs to be filtered-out so that the profile doesn't need an upgrade to
* stateFormatLevel '4'.
*/
LIB_EXPORT BOOL
RuntimeAlgorithmKeySizeCheckEnabled(struct RuntimeAlgorithm *RuntimeAlgorithm,
TPM_ALG_ID algId, // IN: the algorithm to check
UINT16 keySizeInBits, // IN: size of the key in bits
TPM_ECC_CURVE curveId, // IN: curve Id if algId == TPM_ALG_ECC
unsigned int maxStateFormatLevel // IN: maximum stateFormatLevel
)
static BOOL _RuntimeAlgorithmKeySizeCheckEnabled(
struct RuntimeAlgorithm *RuntimeAlgorithm,
TPM_ALG_ID algId, // IN: the algorithm to check
UINT16 keySizeInBits, // IN: size of the key in bits
unsigned int maxStateFormatLevel, // IN: maximum stateFormatLevel
TPM_ECC_CURVE curveId // IN: curve Id for TPM_ALG_ECC
)
{
const struct KeySizes *keysizes;
UINT16 minKeySize;
Expand Down Expand Up @@ -578,6 +578,41 @@ RuntimeAlgorithmKeySizeCheckEnabled(struct RuntimeAlgorithm *RuntimeAlgorithm,
return TRUE;
}

LIB_EXPORT BOOL
RuntimeAlgorithmKeySizeCheckEnabled(
struct RuntimeAlgorithm *RuntimeAlgorithm,
TPM_ALG_ID algId, // IN: the algorithm to check
UINT16 keySizeInBits, // IN: size of the key in bits
unsigned int maxStateFormatLevel // IN: maximum stateFormatLevel
)
{
return _RuntimeAlgorithmKeySizeCheckEnabled(
RuntimeAlgorithm,
algId,
keySizeInBits,
maxStateFormatLevel,
TPM_ECC_NONE
);
}

LIB_EXPORT BOOL
RuntimeAlgorithmEccKeySizeCheckEnabled(
struct RuntimeAlgorithm *RuntimeAlgorithm,
TPM_ALG_ID algId, // IN: the algorithm to check
UINT16 keySizeInBits, // IN: size of the key in bits
TPM_ECC_CURVE curveId, // IN: curve Id if algId == TPM_ALG_ECC
unsigned int maxStateFormatLevel // IN: maximum stateFormatLevel
)
{
return _RuntimeAlgorithmKeySizeCheckEnabled(
RuntimeAlgorithm,
algId,
keySizeInBits,
maxStateFormatLevel,
curveId
);
}

static char *
RuntimeAlgorithmGet(
const struct AlgorithmShortcuts *shortcuts, size_t shortcuts_len,
Expand Down
21 changes: 15 additions & 6 deletions src/tpm2/RuntimeAlgorithm_fp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,21 @@ RuntimeAlgorithmCheckEnabled(struct RuntimeAlgorithm *RuntimeAlgorithm,
);

BOOL
RuntimeAlgorithmKeySizeCheckEnabled(struct RuntimeAlgorithm *RuntimeAlgorithm,
TPM_ALG_ID algId, // IN: the algorithm to check
UINT16 keySizeInBits, // IN: size of the key in bits
TPM_ECC_CURVE curveId, // IN: curveId if algId == TPM_ALG_ECC
unsigned int maxStateFormatLevel // IN: maximum stateFormatLevel
);
RuntimeAlgorithmKeySizeCheckEnabled(
struct RuntimeAlgorithm *RuntimeAlgorithm,
TPM_ALG_ID algId, // IN: the algorithm to check
UINT16 keySizeInBits, // IN: size of the key in bits
unsigned int maxStateFormatLevel // IN: maximum stateFormatLevel
);

BOOL
RuntimeAlgorithmEccKeySizeCheckEnabled(
struct RuntimeAlgorithm *RuntimeAlgorithm,
TPM_ALG_ID algId, // IN: the algorithm to check
UINT16 keySizeInBits, // IN: size of the key in bits
TPM_ECC_CURVE curveId, // IN: curveId if algId == TPM_ALG_ECC
unsigned int maxStateFormatLevel // IN: maximum stateFormatLevel
);

enum RuntimeAlgorithmType {
RUNTIME_ALGO_IMPLEMENTED,
Expand Down
1 change: 0 additions & 1 deletion src/tpm2/TPMCmd/tpm/src/crypt/AlgorithmTests.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,6 @@ static void TestSymmetricAlgorithm(const SYMMETRIC_TEST_VECTOR* test, //
/* Skip test cases whose algorithms or keysizes are runtime-disabled */
if (!RuntimeAlgorithmKeySizeCheckEnabled(&g_RuntimeProfile.RuntimeAlgorithm,
test->alg, test->keyBits,
TPM_ECC_NONE,
g_RuntimeProfile.stateFormatLevel))
return;
// libtpms added end
Expand Down
20 changes: 10 additions & 10 deletions src/tpm2/TPMCmd/tpm/src/crypt/CryptEccMain.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,11 @@ CryptCapGetECCCurve(TPM_ECC_CURVE curveID, // IN: the starting ECC curve
continue;
if (!CryptEccIsCurveRuntimeUsable(curve)) // libtpms added begin
continue;
if (!RuntimeAlgorithmKeySizeCheckEnabled(&g_RuntimeProfile.RuntimeAlgorithm,
TPM_ALG_ECC,
CryptEccGetKeySizeForCurve(curve),
curve,
g_RuntimeProfile.stateFormatLevel))
if (!RuntimeAlgorithmEccKeySizeCheckEnabled(&g_RuntimeProfile.RuntimeAlgorithm,
TPM_ALG_ECC,
CryptEccGetKeySizeForCurve(curve),
curve,
g_RuntimeProfile.stateFormatLevel))
continue; // libtpms added end
if(curveList->count < maxCount)
{
Expand Down Expand Up @@ -160,11 +160,11 @@ BOOL CryptCapGetOneECCCurve(TPM_ECC_CURVE curveID // IN: the ECC curve
UINT16 i;

if (!CryptEccIsCurveRuntimeUsable(curveID) || // libtpms added begin
!RuntimeAlgorithmKeySizeCheckEnabled(&g_RuntimeProfile.RuntimeAlgorithm,
TPM_ALG_ECC,
CryptEccGetKeySizeForCurve(curveID),
curveID,
g_RuntimeProfile.stateFormatLevel))
!RuntimeAlgorithmEccKeySizeCheckEnabled(&g_RuntimeProfile.RuntimeAlgorithm,
TPM_ALG_ECC,
CryptEccGetKeySizeForCurve(curveID),
curveID,
g_RuntimeProfile.stateFormatLevel))
return FALSE; // libtpms added end

// Scan the eccCurveValues array
Expand Down
2 changes: 0 additions & 2 deletions src/tpm2/TPMCmd/tpm/src/crypt/CryptUtil.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ static TPM_RC CryptHmacSign(TPMT_SIGNATURE* signature, // OUT: signature
if (!RuntimeAlgorithmKeySizeCheckEnabled(&g_RuntimeProfile.RuntimeAlgorithm,// libtpms added begin
TPM_ALG_HMAC,
signKey->sensitive.sensitive.bits.t.size * 8,
TPM_ECC_NONE,
g_RuntimeProfile.stateFormatLevel))
return TPM_RC_KEY_SIZE; // libtpms added end

Expand Down Expand Up @@ -70,7 +69,6 @@ static TPM_RC CryptHMACVerifySignature(
if (!RuntimeAlgorithmKeySizeCheckEnabled(&g_RuntimeProfile.RuntimeAlgorithm,// libtpm added begin
TPM_ALG_HMAC,
signKey->sensitive.sensitive.bits.t.size * 8,
TPM_ECC_NONE,
g_RuntimeProfile.stateFormatLevel))
return TPM_RC_KEY_SIZE; // libtpms added end

Expand Down
14 changes: 5 additions & 9 deletions src/tpm2/Unmarshal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,11 +223,11 @@ TPM_ECC_CURVE_Unmarshal(TPM_ECC_CURVE *target, BYTE **buffer, INT32 *size)
!CryptEccIsCurveRuntimeUsable(*target)) {
rc = TPM_RC_CURVE;
}
if (!RuntimeAlgorithmKeySizeCheckEnabled(&g_RuntimeProfile.RuntimeAlgorithm,
TPM_ALG_ECC,
CryptEccGetKeySizeForCurve(*target),
*target,
g_RuntimeProfile.stateFormatLevel)) {
if (!RuntimeAlgorithmEccKeySizeCheckEnabled(&g_RuntimeProfile.RuntimeAlgorithm,
TPM_ALG_ECC,
CryptEccGetKeySizeForCurve(*target),
*target,
g_RuntimeProfile.stateFormatLevel)) {
rc = TPM_RC_CURVE;
} // libtpms added end
break;
Expand Down Expand Up @@ -2872,7 +2872,6 @@ TPMI_AES_KEY_BITS_Unmarshal(TPMI_AES_KEY_BITS *target, BYTE **buffer, INT32 *siz
if (!RuntimeAlgorithmKeySizeCheckEnabled(&g_RuntimeProfile.RuntimeAlgorithm, // libtpms added begin
TPM_ALG_AES,
*target,
TPM_ECC_NONE,
g_RuntimeProfile.stateFormatLevel)) {
rc = TPM_RC_VALUE;
} // libtpms added end
Expand Down Expand Up @@ -2912,7 +2911,6 @@ TPMI_CAMELLIA_KEY_BITS_Unmarshal(TPMI_CAMELLIA_KEY_BITS *target, BYTE **buffer,
if (!RuntimeAlgorithmKeySizeCheckEnabled(&g_RuntimeProfile.RuntimeAlgorithm, // libtpms added begin
TPM_ALG_CAMELLIA,
*target,
TPM_ECC_NONE,
g_RuntimeProfile.stateFormatLevel)) {
rc = TPM_RC_VALUE;
} // libtpms added end
Expand Down Expand Up @@ -2975,7 +2973,6 @@ TPMI_TDES_KEY_BITS_Unmarshal(TPMI_SM4_KEY_BITS *target, BYTE **buffer, INT32 *si
if (!RuntimeAlgorithmKeySizeCheckEnabled(&g_RuntimeProfile.RuntimeAlgorithm,// libtpms added begin
TPM_ALG_TDES,
*target,
TPM_ECC_NONE,
g_RuntimeProfile.stateFormatLevel)) {
rc = TPM_RC_VALUE;
} // libtpms added end
Expand Down Expand Up @@ -3961,7 +3958,6 @@ TPMI_RSA_KEY_BITS_Unmarshal(TPMI_RSA_KEY_BITS *target, BYTE **buffer, INT32 *siz
if (!RuntimeAlgorithmKeySizeCheckEnabled(&g_RuntimeProfile.RuntimeAlgorithm,
TPM_ALG_RSA,
*target,
TPM_ECC_NONE,
g_RuntimeProfile.stateFormatLevel)) {
rc = TPM_RC_VALUE;
} // libtpms added end
Expand Down