wt/mongoose
1
0 Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2026-11-02 13:20:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2817 from cesanta/chachachan

Browse Source 
fix stack trashing
This commit is contained in:
Sergey Lyubka authored and GitHub committed 2024-07-04 05:57:06 +01:00
2 parents 473a12d700 00862344f7
commit 1c3b6ad59b
2 files changed
+12 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

mongoose.c
+6 -1
View File
@@ -9892,9 +9892,14 @@ static int mg_tls_recv_record(struct mg_connection *c) {
nonce[10] ^= (uint8_t) ((seq >> 8) & 255U);
nonce[11] ^= (uint8_t) ((seq) & 255U);
#if CHACHA20
uint8_t dec[8192];
uint8_t *dec = (uint8_t *) malloc(msgsz);
if (dec == NULL) {
mg_error(c, "TLS OOM");
return -1;
}
size_t n = mg_chacha20_poly1305_decrypt(dec, key, nonce, msg, msgsz);
memmove(msg, dec, n);
free(dec);
#else
mg_aes_gcm_decrypt(msg, msg, msgsz - 16, key, 16, nonce, sizeof(nonce));
#endif
src/tls_builtin.c
+6 -1
View File
@@ -456,9 +456,14 @@ static int mg_tls_recv_record(struct mg_connection *c) {
nonce[10] ^= (uint8_t) ((seq >> 8) & 255U);
nonce[11] ^= (uint8_t) ((seq) & 255U);
#if CHACHA20
uint8_t dec[8192];
uint8_t *dec = (uint8_t *) malloc(msgsz);
if (dec == NULL) {
mg_error(c, "TLS OOM");
return -1;
}
size_t n = mg_chacha20_poly1305_decrypt(dec, key, nonce, msg, msgsz);
memmove(msg, dec, n);
free(dec);
#else
mg_aes_gcm_decrypt(msg, msg, msgsz - 16, key, 16, nonce, sizeof(nonce));
#endif