QPQ-AG/libsodium
12
0
Fork 0
mirror of https://github.com/jedisct1/libsodium.git synced 2026-08-25 08:37:13 +09:00
Code Issues Packages Projects Releases Wiki Activity

Handle c / ad overlap in crypto_aead_chacha20poly1305_encrypt()

Browse Source
This commit is contained in:
Frank Denis
2014-06-26 09:57:39 -07:00
parent eec0f78af6
commit d80dce9139
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsodium/crypto_aead/chacha20poly1305/aead_chacha20poly1305.c
+2 -1
View File
@@ -44,7 +44,6 @@ crypto_aead_chacha20poly1305_encrypt(unsigned char *c,
return -1;
}
#endif
crypto_stream_chacha20_xor_ic(c, m, mlen, npub, 1U, k);
crypto_stream_chacha20(block0, sizeof block0, npub, k);
crypto_onetimeauth_poly1305_init(&state, block0);
@@ -54,6 +53,8 @@ crypto_aead_chacha20poly1305_encrypt(unsigned char *c,
_u64_le_from_ull(slen, adlen);
crypto_onetimeauth_poly1305_update(&state, slen, sizeof slen);
crypto_stream_chacha20_xor_ic(c, m, mlen, npub, 1U, k);
crypto_onetimeauth_poly1305_update(&state, c, mlen);
_u64_le_from_ull(slen, mlen);
crypto_onetimeauth_poly1305_update(&state, slen, sizeof slen);