Proxmox-Port/libtpms
1
0
Fork 0
mirror of https://github.com/stefanberger/libtpms synced 2026-08-12 19:25:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tpm2: Helpers,OpenSSL: Convert some TPM_RC_FAILURE to TPM_RC_MEMORY

Browse Source 
Convert those TPM_RC_FAILURE return codes to TPM_RC_MEMORY where
it is certain that it is only an issue related to no memory being available
rather than anything else. The following OpenSSL functions qualify for
this:

- BN_CTX_new & BN_CTX_new_ex
- BN_new

The following ones do not qualify:

- RSA_new: could have failure with ENGINE_init() and ENGINE_get_RSA()
- EC_KEY_new: could have failure with ENGINE_init() and ENGINE_get_EC()
- BigInitialized: initializer could be NULL
- BN_bin2bn: length could be 0

Some functions now test for NULL pointers early on to return TPM_RC_MEMORY.
They would previously have failed in BigInitialized() if the BIGNUM had
been a NULL pointer.

Since TPM_RC_FAILURES should never occur, the new TPM_RC_MEMORYs should
never occur, either. So, this is primarily a clean-up.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
This commit is contained in:
Stefan Berger 2025-06-13 13:42:55 -04:00 committed by Stefan Berger
parent 22bb8db8e6
commit e369684b99
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tpm2/TpmEcc_Signature_ECDSA.c
View File

@ -194,6 +194,9 @@ TpmEcc_SignEcdsa(Crypt_Int* bnR, // OUT: 'r' component of the signa
const BIGNUM* s;
BIGNUM* d = BN_new();
if (!d)
return TPM_RC_MEMORY;
d = BigInitialized(d, (bigConst)bnD);
eckey = EC_KEY_new();
@ -310,6 +313,9 @@ TpmEcc_ValidateSignatureEcdsa(
BIGNUM* s = BN_new();
EC_POINT* q = EcPointInitialized((bn_point_t*)ecQ, E);
if (!r || !s)
ERROR_EXIT(TPM_RC_MEMORY);
if (digest->b.size == CryptHashGetDigestSize(TPM_ALG_SHA1) &&
RuntimeProfileRequiresAttributeFlags(&g_RuntimeProfile,
RUNTIME_ATTRIBUTE_NO_SHA1_VERIFICATION))

4
src/tpm2/crypto/openssl/CryptSym.c
View File

@ -591,7 +591,7 @@ CryptSymmetricEncrypt(
buffersize = TPM2_ROUNDUP(dSize, blockSize);
buffer = malloc(buffersize);
if (buffer == NULL)
ERROR_EXIT(TPM_RC_FAILURE);
ERROR_EXIT(TPM_RC_MEMORY);
pOut = buffer;
}
@ -714,7 +714,7 @@ CryptSymmetricDecrypt(
buffersize = TPM2_ROUNDUP(dSize + blockSize, blockSize);
buffer = malloc(buffersize);
if (buffer == NULL)
ERROR_EXIT(TPM_RC_FAILURE);
ERROR_EXIT(TPM_RC_MEMORY);
#if ALG_TDES && ALG_CTR
if (algorithm == TPM_ALG_TDES && mode == TPM_ALG_CTR) {

13
src/tpm2/crypto/openssl/Helpers.c
View File

@ -866,6 +866,9 @@ InitOpenSSLRSAPrivateKey(OBJECT *rsaKey, // IN
BN_CTX *ctx = NULL;
TPM_RC retVal;
if (!dP || !dQ || !qInv)
ERROR_EXIT(TPM_RC_MEMORY);
if (ObjectGetPublicParameters(rsaKey, &N, &E) != 1)
ERROR_EXIT(TPM_RC_FAILURE);
@ -884,7 +887,7 @@ InitOpenSSLRSAPrivateKey(OBJECT *rsaKey, // IN
Q = BN_new();
Qr = BN_new();
if (ctx == NULL || Q == NULL || Qr == NULL)
ERROR_EXIT(TPM_RC_FAILURE);
ERROR_EXIT(TPM_RC_MEMORY);
/* Q = N/P; no remainder */
BN_set_flags(P, BN_FLG_CONSTTIME); // P is secret
if (!BN_div(Q, Qr, N, P, ctx) || !BN_is_zero(Qr))
@ -952,7 +955,9 @@ OpenSSLCryptRsaGenerateKey(
EVP_PKEY *pkey = NULL;
CRYPT_RSA_VAR(tmp);
if (bnE == NULL || BN_set_word(bnE, e) != 1)
if (bnE == NULL)
return TPM_RC_MEMORY;
if (BN_set_word(bnE, e) != 1)
ERROR_EXIT(TPM_RC_FAILURE);
if ((ctx = EVP_PKEY_CTX_new_from_name(NULL, "RSA", NULL)) == NULL ||
@ -1016,7 +1021,9 @@ OpenSSLCryptRsaGenerateKey(
BIGNUM *bnE = BN_new();
CRYPT_RSA_VAR(tmp);
if (bnE == NULL || BN_set_word(bnE, e) != 1)
if (bnE == NULL)
return TPM_RC_MEMORY;
if (BN_set_word(bnE, e) != 1)
ERROR_EXIT(TPM_RC_FAILURE);
rsa = RSA_new();