VeraCrypt
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Common/Pkcs5.c2
-rw-r--r--src/Main/GraphicUserInterface.cpp3
-rw-r--r--src/Main/TextUserInterface.cpp3
-rw-r--r--src/Volume/Volume.cpp3
4 files changed, 1 insertions, 10 deletions
diff --git a/src/Common/Pkcs5.c b/src/Common/Pkcs5.c
index ea0a987..ef263db 100644
--- a/src/Common/Pkcs5.c
+++ b/src/Common/Pkcs5.c
@@ -401,7 +401,7 @@ typedef struct hmac_ripemd160_ctx_struct
void hmac_ripemd160_internal (char *key, int keylen, char *input_digest, int len, hmac_ripemd160_ctx* hmac)
{
RMD160_CTX* context = &(hmac->context);
- unsigned char* k_pad = hmac->k_pad; /* inner/outer padding - key XORd with ipad */
+ unsigned char* k_pad = (unsigned char*) hmac->k_pad; /* inner/outer padding - key XORd with ipad */
int i;
/*
diff --git a/src/Main/GraphicUserInterface.cpp b/src/Main/GraphicUserInterface.cpp
index 014978a..94a77cb 100644
--- a/src/Main/GraphicUserInterface.cpp
+++ b/src/Main/GraphicUserInterface.cpp
@@ -1392,19 +1392,16 @@ namespace VeraCrypt
File backupFile;
backupFile.Open (*files.front(), File::OpenRead);
- uint64 headerSize;
bool legacyBackup;
// Determine the format of the backup file
switch (backupFile.Length())
{
case TC_VOLUME_HEADER_GROUP_SIZE:
- headerSize = TC_VOLUME_HEADER_SIZE;
legacyBackup = false;
break;
case TC_VOLUME_HEADER_SIZE_LEGACY * 2:
- headerSize = TC_VOLUME_HEADER_SIZE_LEGACY;
legacyBackup = true;
break;
diff --git a/src/Main/TextUserInterface.cpp b/src/Main/TextUserInterface.cpp
index 50153eb..0bf3485 100644
--- a/src/Main/TextUserInterface.cpp
+++ b/src/Main/TextUserInterface.cpp
@@ -1470,19 +1470,16 @@ namespace VeraCrypt
File backupFile;
backupFile.Open (filePath, File::OpenRead);
- uint64 headerSize;
bool legacyBackup;
// Determine the format of the backup file
switch (backupFile.Length())
{
case TC_VOLUME_HEADER_GROUP_SIZE:
- headerSize = TC_VOLUME_HEADER_SIZE;
legacyBackup = false;
break;
case TC_VOLUME_HEADER_SIZE_LEGACY * 2:
- headerSize = TC_VOLUME_HEADER_SIZE_LEGACY;
legacyBackup = true;
break;
diff --git a/src/Volume/Volume.cpp b/src/Volume/Volume.cpp
index ff37302..0a46115 100644
--- a/src/Volume/Volume.cpp
+++ b/src/Volume/Volume.cpp
@@ -119,9 +119,6 @@ namespace VeraCrypt
bool skipLayoutV1Normal = false;
bool deviceHosted = GetPath().IsDevice();
- size_t hostDeviceSectorSize = 0;
- if (deviceHosted)
- hostDeviceSectorSize = volumeFile->GetDeviceSectorSize();
// Test volume layouts
foreach (shared_ptr <VolumeLayout> layout, VolumeLayout::GetAvailableLayouts (volumeType))