mirror of
https://github.com/veracrypt/VeraCrypt.git
synced 2025-11-11 19:08:26 -06:00
Avoid conflict with C++17 features std::byte by using uint8 type instead of byte
This commit is contained in:
@@ -518,7 +518,7 @@ static int ExpandVolume (HWND hwndDlg, wchar_t *lpszVolume, Password *pVolumePas
|
||||
BOOL bTimeStampValid = FALSE;
|
||||
LARGE_INTEGER headerOffset;
|
||||
BOOL backupHeader;
|
||||
byte *wipeBuffer = NULL;
|
||||
uint8 *wipeBuffer = NULL;
|
||||
uint32 workChunkSize = TC_VOLUME_HEADER_GROUP_SIZE;
|
||||
#ifdef _WIN64
|
||||
CRYPTO_INFO tmpCI;
|
||||
@@ -1023,9 +1023,9 @@ static int ExpandVolume (HWND hwndDlg, wchar_t *lpszVolume, Password *pVolumePas
|
||||
/* wipe old backup header */
|
||||
if ( !cryptoInfo->LegacyVolume )
|
||||
{
|
||||
byte wipeRandChars [TC_WIPE_RAND_CHAR_COUNT];
|
||||
byte wipeRandCharsUpdate [TC_WIPE_RAND_CHAR_COUNT];
|
||||
byte wipePass;
|
||||
uint8 wipeRandChars [TC_WIPE_RAND_CHAR_COUNT];
|
||||
uint8 wipeRandCharsUpdate [TC_WIPE_RAND_CHAR_COUNT];
|
||||
uint8 wipePass;
|
||||
UINT64_STRUCT unitNo;
|
||||
LARGE_INTEGER offset;
|
||||
WipeAlgorithmId wipeAlgorithm = TC_WIPE_35_GUTMANN;
|
||||
@@ -1040,7 +1040,7 @@ static int ExpandVolume (HWND hwndDlg, wchar_t *lpszVolume, Password *pVolumePas
|
||||
|
||||
DebugAddProgressDlgStatus(hwndDlg, GetString("EXPANDER_WIPING_OLD_HEADER"));
|
||||
|
||||
wipeBuffer = (byte *) TCalloc (workChunkSize);
|
||||
wipeBuffer = (uint8 *) TCalloc (workChunkSize);
|
||||
if (!wipeBuffer)
|
||||
{
|
||||
nStatus = ERR_OUTOFMEMORY;
|
||||
|
||||
@@ -216,7 +216,7 @@ static volatile BOOL WriteThreadRunning;
|
||||
static volatile BOOL WriteThreadExitRequested;
|
||||
static HANDLE WriteThreadHandle;
|
||||
|
||||
static byte *WriteThreadBuffer;
|
||||
static uint8 *WriteThreadBuffer;
|
||||
static HANDLE WriteBufferEmptyEvent;
|
||||
static HANDLE WriteBufferFullEvent;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user