mirrors
/
VeraCrypt
mirror of https://github.com/veracrypt/VeraCrypt.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove dead code from chacha_ECRYPT_encrypt_bytes (Coverity)

This commit is contained in:
Mounir IDRASSI 2022-03-26 18:46:01 +01:00
parent 533269ca9a
commit 05fd14006d
No known key found for this signature in database
GPG Key ID: 02C30AE90FAE4A6F
2 changed files with 16 additions and 15 deletions
Show Stats 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

8
src/Setup/SelfExtract.c
View File

@ -595,6 +595,14 @@ BOOL SelfExtractInMemory (wchar_t *path, BOOL bSkipCountCheck)
if (compressedLen != fileDataEndPos - fileDataStartPos - 8 + 1)
{
Error ("DIST_PACKAGE_CORRUPTED", NULL);
return FALSE;
}
// Test to make Coverity happy. It will always be false
if (uncompressedLen >= (INT_MAX - 524288))
{
Error ("DIST_PACKAGE_CORRUPTED", NULL);
return FALSE;
}
decompressedDataLen = uncompressedLen;