Public/VeraCrypt
1
0 Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2026-10-05 16:46:35 -05:00
Code Activity

Avoid conflict with C++17 features std::byte by using uint8 type instead of byte

Browse Source
This commit is contained in:
Mounir IDRASSI committed 2024-06-12 12:30:04 +02:00
1 parent bf9f3ec4f0
commit 455a4f2176
132 files changed
+1032 -1035
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Volume/Keyfile.cpp
+9 -9
View File
@@ -35,7 +35,7 @@ namespace VeraCrypt
if (Token::IsKeyfilePathValid (Path, emvSupportEnabled))
{
// Apply keyfile generated by a security token
vector <byte> keyfileData;
vector <uint8> keyfileData;
Token::getTokenKeyfile(wstring(Path))->GetKeyfileData(keyfileData);
if (keyfileData.size() < MinProcessedLength)
@@ -45,10 +45,10 @@ namespace VeraCrypt
{
uint32 crc = crc32.Process(keyfileData[i]);
pool[poolPos++] += (byte)(crc >> 24);
pool[poolPos++] += (byte)(crc >> 16);
pool[poolPos++] += (byte)(crc >> 8);
pool[poolPos++] += (byte) crc;
pool[poolPos++] += (uint8)(crc >> 24);
pool[poolPos++] += (uint8)(crc >> 16);
pool[poolPos++] += (uint8)(crc >> 8);
pool[poolPos++] += (uint8) crc;
if (poolPos >= pool.Size())
poolPos = 0;
@@ -69,10 +69,10 @@ namespace VeraCrypt
for (size_t i = 0; i < readLength; i++)
{
uint32 crc = crc32.Process(keyfileBuf[i]);
pool[poolPos++] += (byte)(crc >> 24);
pool[poolPos++] += (byte)(crc >> 16);
pool[poolPos++] += (byte)(crc >> 8);
pool[poolPos++] += (byte) crc;
pool[poolPos++] += (uint8)(crc >> 24);
pool[poolPos++] += (uint8)(crc >> 16);
pool[poolPos++] += (uint8)(crc >> 8);
pool[poolPos++] += (uint8) crc;
if (poolPos >= pool.Size())
poolPos = 0;
if (++totalLength >= MaxProcessedLength)