Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2026-01-01 03:19:44 -06:00
Code Activity

Remove dead code from chacha_ECRYPT_encrypt_bytes (Coverity)

Browse Source
This commit is contained in:
Mounir IDRASSI
2022-03-26 18:46:01 +01:00
parent 533269ca9a
commit 05fd14006d
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Crypto/chacha-xmm.c
View File

@@ -139,22 +139,15 @@ void chacha_ECRYPT_encrypt_bytes(size_t bytes, uint32* x, const uint8* m, uint8*
#endif
if (!bytes) return;
for (;;) {
salsa20_wordtobyte(output,x, r);
x[12] = PLUSONE(x[12]);
if (!x[12]) {
x[13] = PLUSONE(x[13]);
/* stopping at 2^70 bytes per nonce is user's responsibility */
}
if (bytes <= 64) {
for (i = 0;i < bytes;++i) out[i] = m[i] ^ output[i];
return;
}
for (i = 0;i < 64;++i) out[i] = m[i] ^ output[i];
bytes -= 64;
out += 64;
m += 64;
// bytes is now guaranteed to be between 1 and 63
salsa20_wordtobyte(output,x, r);
x[12] = PLUSONE(x[12]);
if (!x[12]) {
x[13] = PLUSONE(x[13]);
/* stopping at 2^70 bytes per nonce is user's responsibility */
}
for (i = 0;i < bytes;++i) out[i] = m[i] ^ output[i];
}
#endif