scip/pcp
1
0
Fork 0
mirror of https://codeberg.org/scip/pcp.git synced 2025-12-17 12:00:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed memory leak, caused by change from yesterday

Browse Source
This commit is contained in:
TLINDEN
2015-04-17 09:44:22 +02:00
parent c86d497e09
commit 726793f032
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libpcp/crypto.c
View File

@@ -457,7 +457,6 @@ size_t pcp_encrypt_stream_sym(PCPCTX *ptx, Pcpstream *in, Pcpstream *out, byte *
buf_nonce = _gen_ctr_nonce(ctr++); buf_nonce = _gen_ctr_nonce(ctr++);
es = pcp_sodium_mac(&buf_cipher, in_buf, cur_bufsize, buf_nonce, symkey); es = pcp_sodium_mac(&buf_cipher, in_buf, cur_bufsize, buf_nonce, symkey);
ps_write(out, buf_nonce, crypto_secretbox_NONCEBYTES); ps_write(out, buf_nonce, crypto_secretbox_NONCEBYTES);
ps_write(out, buf_cipher, es); ps_write(out, buf_cipher, es);
@@ -465,12 +464,13 @@ size_t pcp_encrypt_stream_sym(PCPCTX *ptx, Pcpstream *in, Pcpstream *out, byte *
if(recsign != NULL) if(recsign != NULL)
crypto_generichash_update(st, buf_cipher, es); crypto_generichash_update(st, buf_cipher, es);
ucfree(buf_nonce, crypto_secretbox_NONCEBYTES);
free(buf_cipher);
} }
free(buf_nonce);
free(buf_cipher);
if(ps_err(out) != 0) { if(ps_err(out) != 0) {
free(buf_cipher);
fatal(ptx, "Failed to write encrypted output!\n"); fatal(ptx, "Failed to write encrypted output!\n");
goto errsym1; goto errsym1;
} }
@@ -492,8 +492,10 @@ size_t pcp_encrypt_stream_sym(PCPCTX *ptx, Pcpstream *in, Pcpstream *out, byte *
ps_write(out, buf_cipher, es); ps_write(out, buf_cipher, es);
free(st); free(st);
ucfree(signature, siglen);
free(hash); free(hash);
ucfree(buf_nonce, crypto_secretbox_NONCEBYTES);
free(buf_cipher);
ucfree(signature, siglen);
} }
ucfree(in_buf, PCP_BLOCK_SIZE); ucfree(in_buf, PCP_BLOCK_SIZE);
@@ -521,6 +523,7 @@ size_t pcp_decrypt_stream_sym(PCPCTX *ptx, Pcpstream *in, Pcpstream* out, byte *
buf_nonce = ucmalloc(crypto_secretbox_NONCEBYTES); buf_nonce = ucmalloc(crypto_secretbox_NONCEBYTES);
buf_cipher = ucmalloc(ciphersize); buf_cipher = ucmalloc(ciphersize);
buf_clear = ucmalloc(ciphersize);
out_size = 0; out_size = 0;
byte *signature = NULL; byte *signature = NULL;
@@ -573,13 +576,10 @@ size_t pcp_decrypt_stream_sym(PCPCTX *ptx, Pcpstream *in, Pcpstream* out, byte *
if(es == 0) { if(es == 0) {
ps_write(out, buf_clear, ciphersize - PCP_CRYPTO_ADD); ps_write(out, buf_clear, ciphersize - PCP_CRYPTO_ADD);
/* fwrite(buf_clear, ciphersize - PCP_CRYPTO_ADD, 1, out); */
if(recverify != NULL) if(recverify != NULL)
crypto_generichash_update(st, buf_cipher, ciphersize); crypto_generichash_update(st, buf_cipher, ciphersize);
free(buf_clear);
if(ps_err(out) != 0) { if(ps_err(out) != 0) {
fatal(ptx, "Failed to write decrypted output!\n"); fatal(ptx, "Failed to write decrypted output!\n");
out_size = 0; out_size = 0;
@@ -588,7 +588,6 @@ size_t pcp_decrypt_stream_sym(PCPCTX *ptx, Pcpstream *in, Pcpstream* out, byte *
} }
else { else {
fatal(ptx, "Failed to decrypt file content!\n"); fatal(ptx, "Failed to decrypt file content!\n");
free(buf_clear);
out_size = 0; out_size = 0;
break; break;
} }
@@ -596,6 +595,7 @@ size_t pcp_decrypt_stream_sym(PCPCTX *ptx, Pcpstream *in, Pcpstream* out, byte *
ucfree(in_buf, PCP_BLOCK_SIZE_IN); ucfree(in_buf, PCP_BLOCK_SIZE_IN);
ucfree(buf_cipher, ciphersize); ucfree(buf_cipher, ciphersize);
ucfree(buf_clear, ciphersize);
if(recverify != NULL) { if(recverify != NULL) {
/* decrypt the signature */ /* decrypt the signature */