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

wolfcrypt/src/cmac.c: add wc_CmacFree(), revert wc_CmacFinal(), rename wc_CmacFinal() as wc_CmacFinalNoFree() removing its deallocation clauses, and add new wc_CmacFinal() that calls wc_CmacFinalNoFree() then calls wc_CmacFree() unconditionally, for compatibility with legacy client code (some of which may have previously leaked). 

tests/api.c: modify test_wc_CmacFinal() to use wc_CmacFinalNoFree() except for the final call.

wolfcrypt/src/aes.c:
* fix wc_AesEaxEncryptAuth() and wc_AesEaxDecryptAuth() to call wc_AesEaxFree() only if wc_AesEaxInit() succeeded.
* fix wc_AesEaxInit() to free all resources on failure.
* revert wc_AesEaxEncryptFinal() and wc_AesEaxDecryptFinal() changes, then change wc_CmacFinal() calls in them to wc_CmacFinalNoFree() calls.
* wc_AesEaxFree(): add wc_CmacFree() calls.
pull/7031/head
Daniel Pouzzner 2023-12-06 16:55:57 -06:00
parent 689a82a622
commit b14aba48af
5 changed files with 104 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ssl_crypto.c
View File

@ -2106,7 +2106,7 @@ void wolfSSL_CMAC_CTX_free(WOLFSSL_CMAC_CTX *ctx)
if (ctx != NULL) { if (ctx != NULL) {
/* Deallocate dynamically allocated fields. */ /* Deallocate dynamically allocated fields. */
if (ctx->internal != NULL) { if (ctx->internal != NULL) {
wc_CmacFinal((Cmac*)ctx->internal, NULL, NULL); wc_CmacFree((Cmac*)ctx->internal);
XFREE(ctx->internal, NULL, DYNAMIC_TYPE_CMAC); XFREE(ctx->internal, NULL, DYNAMIC_TYPE_CMAC);
} }
if (ctx->cctx != NULL) { if (ctx->cctx != NULL) {

8
tests/api.c
View File

@ -15795,12 +15795,14 @@ static int test_wc_CmacFinal(void)
ExpectIntEQ(wc_InitCmac(&cmac, key, keySz, type, NULL), 0); ExpectIntEQ(wc_InitCmac(&cmac, key, keySz, type, NULL), 0);
ExpectIntEQ(wc_CmacUpdate(&cmac, msg, msgSz), 0); ExpectIntEQ(wc_CmacUpdate(&cmac, msg, msgSz), 0);
ExpectIntEQ(wc_CmacFinal(&cmac, mac, &macSz), 0); ExpectIntEQ(wc_CmacFinalNoFree(&cmac, mac, &macSz), 0);
ExpectIntEQ(XMEMCMP(mac, expMac, expMacSz), 0); ExpectIntEQ(XMEMCMP(mac, expMac, expMacSz), 0);
/* Pass in bad args. */ /* Pass in bad args. */
ExpectIntEQ(wc_CmacFinal(NULL, mac, &macSz), BAD_FUNC_ARG); ExpectIntEQ(wc_CmacFinalNoFree(NULL, mac, &macSz), BAD_FUNC_ARG);
ExpectIntEQ(wc_CmacFinal(&cmac, NULL, &macSz), BAD_FUNC_ARG); ExpectIntEQ(wc_CmacFinalNoFree(&cmac, NULL, &macSz), BAD_FUNC_ARG);
/* For the last call, use the API with implicit wc_CmacFree(). */
ExpectIntEQ(wc_CmacFinal(&cmac, mac, &badMacSz), BUFFER_E); ExpectIntEQ(wc_CmacFinal(&cmac, mac, &badMacSz), BUFFER_E);
#endif #endif
return EXPECT_RESULT(); return EXPECT_RESULT();

133
wolfcrypt/src/aes.c
View File

@ -13266,6 +13266,7 @@ int wc_AesEaxEncryptAuth(const byte* key, word32 keySz, byte* out,
AesEax *eax = &eax_mem; AesEax *eax = &eax_mem;
#endif #endif
int ret; int ret;
int eaxInited = 0;
if (key == NULL || out == NULL || in == NULL || nonce == NULL if (key == NULL || out == NULL || in == NULL || nonce == NULL
|| authTag == NULL || authIn == NULL) { || authTag == NULL || authIn == NULL) {
@ -13286,6 +13287,7 @@ int wc_AesEaxEncryptAuth(const byte* key, word32 keySz, byte* out,
authIn, authInSz)) != 0) { authIn, authInSz)) != 0) {
goto cleanup; goto cleanup;
} }
eaxInited = 1;
if ((ret = wc_AesEaxEncryptUpdate(eax, out, in, inSz, NULL, 0)) != 0) { if ((ret = wc_AesEaxEncryptUpdate(eax, out, in, inSz, NULL, 0)) != 0) {
goto cleanup; goto cleanup;
@ -13296,7 +13298,8 @@ int wc_AesEaxEncryptAuth(const byte* key, word32 keySz, byte* out,
} }
cleanup: cleanup:
wc_AesEaxFree(eax); if (eaxInited)
wc_AesEaxFree(eax);
#if defined(WOLFSSL_SMALL_STACK) #if defined(WOLFSSL_SMALL_STACK)
XFREE(eax, NULL, DYNAMIC_TYPE_AES_EAX); XFREE(eax, NULL, DYNAMIC_TYPE_AES_EAX);
#endif #endif
@ -13326,6 +13329,7 @@ int wc_AesEaxDecryptAuth(const byte* key, word32 keySz, byte* out,
AesEax *eax = &eax_mem; AesEax *eax = &eax_mem;
#endif #endif
int ret; int ret;
int eaxInited = 0;
if (key == NULL || out == NULL || in == NULL || nonce == NULL if (key == NULL || out == NULL || in == NULL || nonce == NULL
|| authTag == NULL || authIn == NULL) { || authTag == NULL || authIn == NULL) {
@ -13347,6 +13351,7 @@ int wc_AesEaxDecryptAuth(const byte* key, word32 keySz, byte* out,
goto cleanup; goto cleanup;
} }
eaxInited = 1;
if ((ret = wc_AesEaxDecryptUpdate(eax, out, in, inSz, NULL, 0)) != 0) { if ((ret = wc_AesEaxDecryptUpdate(eax, out, in, inSz, NULL, 0)) != 0) {
goto cleanup; goto cleanup;
@ -13357,7 +13362,8 @@ int wc_AesEaxDecryptAuth(const byte* key, word32 keySz, byte* out,
} }
cleanup: cleanup:
wc_AesEaxFree(eax); if (eaxInited)
wc_AesEaxFree(eax);
#if defined(WOLFSSL_SMALL_STACK) #if defined(WOLFSSL_SMALL_STACK)
XFREE(eax, NULL, DYNAMIC_TYPE_AES_EAX); XFREE(eax, NULL, DYNAMIC_TYPE_AES_EAX);
#endif #endif
@ -13380,6 +13386,9 @@ int wc_AesEaxInit(AesEax* eax,
{ {
int ret = 0; int ret = 0;
word32 cmacSize; word32 cmacSize;
int aesInited = 0;
int nonceCmacInited = 0;
int aadCmacInited = 0;
if (eax == NULL || key == NULL || nonce == NULL) { if (eax == NULL || key == NULL || nonce == NULL) {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
@ -13388,14 +13397,16 @@ int wc_AesEaxInit(AesEax* eax,
XMEMSET(eax->prefixBuf, 0, sizeof(eax->prefixBuf)); XMEMSET(eax->prefixBuf, 0, sizeof(eax->prefixBuf));
if ((ret = wc_AesInit(&eax->aes, NULL, INVALID_DEVID)) != 0) { if ((ret = wc_AesInit(&eax->aes, NULL, INVALID_DEVID)) != 0) {
return ret; goto out;
} }
aesInited = 1;
if ((ret = wc_AesSetKey(&eax->aes, if ((ret = wc_AesSetKey(&eax->aes,
key, key,
keySz, keySz,
NULL, NULL,
AES_ENCRYPTION)) != 0) { AES_ENCRYPTION)) != 0) {
return ret; goto out;
} }
/* /*
@ -13409,26 +13420,27 @@ int wc_AesEaxInit(AesEax* eax,
NULL)) != 0) { NULL)) != 0) {
return ret; return ret;
} }
nonceCmacInited = 1;
if ((ret = wc_CmacUpdate(&eax->nonceCmac, if ((ret = wc_CmacUpdate(&eax->nonceCmac,
eax->prefixBuf, eax->prefixBuf,
sizeof(eax->prefixBuf))) != 0) { sizeof(eax->prefixBuf))) != 0) {
return ret; goto out;
} }
if ((ret = wc_CmacUpdate(&eax->nonceCmac, nonce, nonceSz)) != 0) { if ((ret = wc_CmacUpdate(&eax->nonceCmac, nonce, nonceSz)) != 0) {
return ret; goto out;
} }
cmacSize = AES_BLOCK_SIZE; cmacSize = AES_BLOCK_SIZE;
if ((ret = wc_CmacFinal(&eax->nonceCmac, if ((ret = wc_CmacFinal(&eax->nonceCmac,
eax->nonceCmacFinal, eax->nonceCmacFinal,
&cmacSize)) != 0) { &cmacSize)) != 0) {
return ret; goto out;
} }
if ((ret = wc_AesSetIV(&eax->aes, eax->nonceCmacFinal)) != 0) { if ((ret = wc_AesSetIV(&eax->aes, eax->nonceCmacFinal)) != 0) {
return ret; goto out;
} }
/* /*
@ -13443,18 +13455,19 @@ int wc_AesEaxInit(AesEax* eax,
keySz, keySz,
WC_CMAC_AES, WC_CMAC_AES,
NULL)) != 0) { NULL)) != 0) {
return ret; goto out;
} }
aadCmacInited = 1;
if ((ret = wc_CmacUpdate(&eax->aadCmac, if ((ret = wc_CmacUpdate(&eax->aadCmac,
eax->prefixBuf, eax->prefixBuf,
sizeof(eax->prefixBuf))) != 0) { sizeof(eax->prefixBuf))) != 0) {
return ret; goto out;
} }
if (authIn != NULL) { if (authIn != NULL) {
if ((ret = wc_CmacUpdate(&eax->aadCmac, authIn, authInSz)) != 0) { if ((ret = wc_CmacUpdate(&eax->aadCmac, authIn, authInSz)) != 0) {
return ret; goto out;
} }
} }
@ -13469,13 +13482,24 @@ int wc_AesEaxInit(AesEax* eax,
keySz, keySz,
WC_CMAC_AES, WC_CMAC_AES,
NULL)) != 0) { NULL)) != 0) {
return ret; goto out;
} }
if ((ret = wc_CmacUpdate(&eax->ciphertextCmac, if ((ret = wc_CmacUpdate(&eax->ciphertextCmac,
eax->prefixBuf, eax->prefixBuf,
sizeof(eax->prefixBuf))) != 0) { sizeof(eax->prefixBuf))) != 0) {
return ret; goto out;
}
out:
if (ret != 0) {
if (aesInited)
wc_AesFree(&eax->aes);
if (nonceCmacInited)
wc_CmacFree(&eax->nonceCmac);
if (aadCmacInited)
wc_CmacFree(&eax->aadCmac);
} }
return ret; return ret;
@ -13599,34 +13623,25 @@ int wc_AesEaxEncryptFinal(AesEax* eax, byte* authTag, word32 authTagSz)
word32 cmacSize; word32 cmacSize;
int ret; int ret;
word32 i; word32 i;
int ciphertextCmac_finalized = 0;
int aadCmac_finalized = 0;
if (eax == NULL) { if (eax == NULL || authTag == NULL || authTagSz > AES_BLOCK_SIZE) {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
if (authTag == NULL || authTagSz > AES_BLOCK_SIZE) {
ret = BAD_FUNC_ARG;
goto out;
}
/* Complete the OMAC for the ciphertext */ /* Complete the OMAC for the ciphertext */
cmacSize = AES_BLOCK_SIZE; cmacSize = AES_BLOCK_SIZE;
ciphertextCmac_finalized = 1; if ((ret = wc_CmacFinalNoFree(&eax->ciphertextCmac,
if ((ret = wc_CmacFinal(&eax->ciphertextCmac, eax->ciphertextCmacFinal,
eax->ciphertextCmacFinal, &cmacSize)) != 0) {
&cmacSize)) != 0) { return ret;
goto out;
} }
/* Complete the OMAC for auth data */ /* Complete the OMAC for auth data */
cmacSize = AES_BLOCK_SIZE; cmacSize = AES_BLOCK_SIZE;
aadCmac_finalized = 1; if ((ret = wc_CmacFinalNoFree(&eax->aadCmac,
if ((ret = wc_CmacFinal(&eax->aadCmac, eax->aadCmacFinal,
eax->aadCmacFinal, &cmacSize)) != 0) {
&cmacSize)) != 0) { return ret;
goto out;
} }
/* /*
@ -13640,16 +13655,7 @@ int wc_AesEaxEncryptFinal(AesEax* eax, byte* authTag, word32 authTagSz)
^ eax->ciphertextCmacFinal[i]; ^ eax->ciphertextCmacFinal[i];
} }
ret = 0; return 0;
out:
if (! ciphertextCmac_finalized)
(void)wc_CmacFinal(&eax->ciphertextCmac, NULL, NULL);
if (! aadCmac_finalized)
(void)wc_CmacFinal(&eax->aadCmac, NULL, NULL);
return ret;
} }
@ -13668,47 +13674,37 @@ int wc_AesEaxDecryptFinal(AesEax* eax,
int ret; int ret;
word32 i; word32 i;
word32 cmacSize; word32 cmacSize;
int ciphertextCmac_finalized = 0;
int aadCmac_finalized = 0;
#if defined(WOLFSSL_SMALL_STACK) #if defined(WOLFSSL_SMALL_STACK)
byte *authTag = NULL; byte *authTag;
#else #else
byte authTag[AES_BLOCK_SIZE]; byte authTag[AES_BLOCK_SIZE];
#endif #endif
if (eax == NULL) { if (eax == NULL || authIn == NULL || authInSz > AES_BLOCK_SIZE) {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
if (authIn == NULL || authInSz > AES_BLOCK_SIZE) {
ret = BAD_FUNC_ARG;
goto out;
}
/* Complete the OMAC for the ciphertext */ /* Complete the OMAC for the ciphertext */
cmacSize = AES_BLOCK_SIZE; cmacSize = AES_BLOCK_SIZE;
ciphertextCmac_finalized = 1; if ((ret = wc_CmacFinalNoFree(&eax->ciphertextCmac,
if ((ret = wc_CmacFinal(&eax->ciphertextCmac, eax->ciphertextCmacFinal,
eax->ciphertextCmacFinal, &cmacSize)) != 0) {
&cmacSize)) != 0) { return ret;
goto out;
} }
/* Complete the OMAC for auth data */ /* Complete the OMAC for auth data */
cmacSize = AES_BLOCK_SIZE; cmacSize = AES_BLOCK_SIZE;
aadCmac_finalized = 1; if ((ret = wc_CmacFinalNoFree(&eax->aadCmac,
if ((ret = wc_CmacFinal(&eax->aadCmac, eax->aadCmacFinal,
eax->aadCmacFinal, &cmacSize)) != 0) {
&cmacSize)) != 0) { return ret;
goto out;
} }
#if defined(WOLFSSL_SMALL_STACK) #if defined(WOLFSSL_SMALL_STACK)
authTag = (byte*)XMALLOC(AES_BLOCK_SIZE, NULL, DYNAMIC_TYPE_TMP_BUFFER); authTag = (byte*)XMALLOC(AES_BLOCK_SIZE, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (authTag == NULL) { if (authTag == NULL) {
ret = MEMORY_E; return MEMORY_E;
goto out;
} }
#endif #endif
@ -13730,13 +13726,6 @@ int wc_AesEaxDecryptFinal(AesEax* eax,
ret = 0; ret = 0;
} }
out:
if (! ciphertextCmac_finalized)
(void)wc_CmacFinal(&eax->ciphertextCmac, NULL, NULL);
if (! aadCmac_finalized)
(void)wc_CmacFinal(&eax->aadCmac, NULL, NULL);
#if defined(WOLFSSL_SMALL_STACK) #if defined(WOLFSSL_SMALL_STACK)
XFREE(authTag, NULL, DYNAMIC_TYPE_TMP_BUFFER); XFREE(authTag, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif #endif
@ -13745,8 +13734,8 @@ out:
} }
/* /*
* Frees the underlying AES context. Must be called when done using the AES EAX * Frees the underlying CMAC and AES contexts. Must be called when done using
* context structure * the AES EAX context structure.
* *
* Returns 0 on success * Returns 0 on success
* Returns error code on failure * Returns error code on failure
@ -13757,6 +13746,8 @@ int wc_AesEaxFree(AesEax* eax)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
(void)wc_CmacFree(&eax->ciphertextCmac);
(void)wc_CmacFree(&eax->aadCmac);
wc_AesFree(&eax->aes); wc_AesFree(&eax->aes);
return 0; return 0;

58
wolfcrypt/src/cmac.c
View File

@ -223,23 +223,32 @@ int wc_CmacUpdate(Cmac* cmac, const byte* in, word32 inSz)
return ret; return ret;
} }
int wc_CmacFree(Cmac* cmac)
{
if (cmac == NULL)
return BAD_FUNC_ARG;
#if defined(WOLFSSL_HASH_KEEP)
/* TODO: msg is leaked if wc_CmacFinal() is not called
* e.g. when multiple calls to wc_CmacUpdate() and one fails but
* wc_CmacFinal() not called. */
if (cmac->msg != NULL) {
XFREE(cmac->msg, cmac->heap, DYNAMIC_TYPE_TMP_BUFFER);
}
#endif
wc_AesFree(&cmac->aes);
ForceZero(cmac, sizeof(Cmac));
return 0;
}
int wc_CmacFinal(Cmac* cmac, byte* out, word32* outSz) int wc_CmacFinalNoFree(Cmac* cmac, byte* out, word32* outSz)
{ {
int ret; int ret;
const byte* subKey; const byte* subKey;
word32 remainder; word32 remainder;
if (cmac == NULL) if (cmac == NULL || out == NULL || outSz == NULL) {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
if (out == NULL || outSz == NULL) {
if ((out == NULL) ^ (outSz == NULL))
return BAD_FUNC_ARG;
ret = 0;
goto out;
} }
if (*outSz < WC_CMAC_TAG_MIN_SZ || *outSz > WC_CMAC_TAG_MAX_SZ) { if (*outSz < WC_CMAC_TAG_MIN_SZ || *outSz > WC_CMAC_TAG_MAX_SZ) {
return BUFFER_E; return BUFFER_E;
} }
@ -251,7 +260,7 @@ int wc_CmacFinal(Cmac* cmac, byte* out, word32* outSz)
{ {
ret = wc_CryptoCb_Cmac(cmac, NULL, 0, NULL, 0, out, outSz, 0, NULL); ret = wc_CryptoCb_Cmac(cmac, NULL, 0, NULL, 0, out, outSz, 0, NULL);
if (ret != CRYPTOCB_UNAVAILABLE) if (ret != CRYPTOCB_UNAVAILABLE)
goto out; return ret;
/* fall-through when unavailable */ /* fall-through when unavailable */
} }
#endif #endif
@ -262,8 +271,7 @@ int wc_CmacFinal(Cmac* cmac, byte* out, word32* outSz)
else { else {
/* ensure we will have a valid remainder value */ /* ensure we will have a valid remainder value */
if (cmac->bufferSz > AES_BLOCK_SIZE) { if (cmac->bufferSz > AES_BLOCK_SIZE) {
ret = BAD_STATE_E; return BAD_STATE_E;
goto out;
} }
remainder = AES_BLOCK_SIZE - cmac->bufferSz; remainder = AES_BLOCK_SIZE - cmac->bufferSz;
@ -284,24 +292,18 @@ int wc_CmacFinal(Cmac* cmac, byte* out, word32* outSz)
XMEMCPY(out, cmac->digest, *outSz); XMEMCPY(out, cmac->digest, *outSz);
} }
#if defined(WOLFSSL_HASH_KEEP) return 0;
/* TODO: msg is leaked if wc_CmacFinal() is not called
* e.g. when multiple calls to wc_CmacUpdate() and one fails but
* wc_CmacFinal() not called. */
if (cmac->msg != NULL) {
XFREE(cmac->msg, cmac->heap, DYNAMIC_TYPE_TMP_BUFFER);
cmac->msg = NULL;
}
#endif
out:
wc_AesFree(&cmac->aes);
ForceZero(cmac, sizeof(Cmac));
return ret;
} }
int wc_CmacFinal(Cmac* cmac, byte* out, word32* outSz) {
int ret;
if (cmac == NULL)
return BAD_FUNC_ARG;
ret = wc_CmacFinalNoFree(cmac, out, outSz);
(void)wc_CmacFree(cmac);
return ret;
}
int wc_AesCmacGenerate(byte* out, word32* outSz, int wc_AesCmacGenerate(byte* out, word32* outSz,
const byte* in, word32 inSz, const byte* in, word32 inSz,

6
wolfssl/wolfcrypt/cmac.h
View File

@ -98,9 +98,15 @@ WOLFSSL_API
int wc_CmacUpdate(Cmac* cmac, int wc_CmacUpdate(Cmac* cmac,
const byte* in, word32 inSz); const byte* in, word32 inSz);
WOLFSSL_API WOLFSSL_API
int wc_CmacFinalNoFree(Cmac* cmac,
byte* out, word32* outSz);
WOLFSSL_API
int wc_CmacFinal(Cmac* cmac, int wc_CmacFinal(Cmac* cmac,
byte* out, word32* outSz); byte* out, word32* outSz);
WOLFSSL_API
int wc_CmacFree(Cmac* cmac);
WOLFSSL_API WOLFSSL_API
int wc_AesCmacGenerate(byte* out, word32* outSz, int wc_AesCmacGenerate(byte* out, word32* outSz,
const byte* in, word32 inSz, const byte* in, word32 inSz,