obgm/libcoap
1
0
Fork 0
mirror of https://github.com/obgm/libcoap.git synced 2025-10-14 02:19:34 +08:00
Code Issues Projects Releases Wiki Activity

Fix wolfSSL bug and MSVC compilation

Browse Source 
When I was fixing MSVC compilation incompatibility due to a dynamic
array on the stack in the coap_crypto_aead_decrypt() function,
I accidentally noticed an incorrect calculation of the array size in
the previous coap_crypto_aead_encrypt() function.
This commit is contained in:
raspopov
2025-10-10 18:50:52 +03:00
committed by Jon Shallow
parent 277f981ab3
commit 490e4e0452
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/coap_wolfssl.c
View File

@@ -3142,7 +3142,7 @@ coap_crypto_aead_encrypt(const coap_crypto_param_t *params,
if (ret != 0)
goto error;
authTag = (byte *)malloc(ccm->tag_len * sizeof(byte));
authTag = (byte *)wolfssl_malloc(ccm->tag_len);
if (!authTag) {
goto error;
}
@@ -3151,18 +3151,18 @@ coap_crypto_aead_encrypt(const coap_crypto_param_t *params,
aad->s, aad->length);
if (ret != 0) {
wolfssl_free(authTag);
goto error;
}
memcpy(result + result_len, authTag, ccm->tag_len);
result_len += sizeof(authTag);
result_len += ccm->tag_len;
*max_result_len = result_len;
wolfssl_free(authTag);
return 1;
error:
coap_crypto_output_errors("coap_crypto_aead_encrypt");
wolfssl_free(authTag);
return 0;
}
@@ -3177,6 +3177,7 @@ coap_crypto_aead_decrypt(const coap_crypto_param_t *params,
Aes aes;
int ret;
int len;
byte *authTag = NULL;
const coap_crypto_aes_ccm_t *ccm;
if (data == NULL)
@@ -3190,15 +3191,17 @@ coap_crypto_aead_decrypt(const coap_crypto_param_t *params,
return 0;
ccm = &params->params.aes;
byte authTag[ccm->tag_len];
if (data->length < ccm->tag_len) {
if (data->length < ccm->tag_len)
return 0;
} else {
memcpy(authTag, data->s + data->length - ccm->tag_len, sizeof(authTag));
data->length -= ccm->tag_len;
authTag = (byte *)wolfssl_malloc(ccm->tag_len);
if (!authTag) {
goto error;
}
memcpy(authTag, data->s + data->length - ccm->tag_len, ccm->tag_len);
data->length -= ccm->tag_len;
if (ccm->key.s == NULL || ccm->nonce == NULL)
goto error;
@@ -3210,17 +3213,19 @@ coap_crypto_aead_decrypt(const coap_crypto_param_t *params,
len = data->length;
ret = wc_AesCcmDecrypt(&aes, result, data->s, len, ccm->nonce,
15 - ccm->l, authTag, sizeof(authTag),
15 - ccm->l, authTag, ccm->tag_len,
aad->s, aad->length);
if (ret != 0)
goto error;
*max_result_len = len;
wolfssl_free(authTag);
return 1;
error:
coap_crypto_output_errors("coap_crypto_aead_decrypt");
wolfssl_free(authTag);
return 0;
}