VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Volume
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2016-06-18 22:36:46 (GMT)
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2016-06-18 22:38:20 (GMT)
commit45617a3285430c7a3961b78234713f457c088bda (patch)
tree45482e4f7d041a3abc956460be37d88ccc805b6c /src/Volume
parent85cab3b85f1d95fe54958c4bd207976dec027dd9 (diff)
downloadVeraCrypt-45617a3285430c7a3961b78234713f457c088bda.zip
VeraCrypt-45617a3285430c7a3961b78234713f457c088bda.tar.gz
Linux/MacOSX: Solve compilation error linked to Camellia cipher addition.
Diffstat (limited to 'src/Volume')
-rw-r--r--src/Volume/Cipher.cpp6
-rw-r--r--src/Volume/Volume.make1
2 files changed, 4 insertions, 3 deletions
diff --git a/src/Volume/Cipher.cpp b/src/Volume/Cipher.cpp
index 2f3594a..743ef34 100644
--- a/src/Volume/Cipher.cpp
+++ b/src/Volume/Cipher.cpp
@@ -245,12 +245,12 @@ namespace VeraCrypt
// Camellia
void CipherCamellia::Decrypt (byte *data) const
{
- camellia_decrypt (data, data, (uint64 *) ScheduledKey.Ptr());
+ camellia_decrypt (data, data, ScheduledKey.Ptr());
}
void CipherCamellia::Encrypt (byte *data) const
{
- camellia_encrypt (data, data, (uint64 *) ScheduledKey.Ptr());
+ camellia_encrypt (data, data, ScheduledKey.Ptr());
}
size_t CipherCamellia::GetScheduledKeySize () const
@@ -260,7 +260,7 @@ namespace VeraCrypt
void CipherCamellia::SetCipherKey (const byte *key)
{
- camellia_set_key (key, (uint64 *) ScheduledKey.Ptr());
+ camellia_set_key (key, ScheduledKey.Ptr());
}
diff --git a/src/Volume/Volume.make b/src/Volume/Volume.make
index 0ef42ac..2888db7 100644
--- a/src/Volume/Volume.make
+++ b/src/Volume/Volume.make
@@ -51,6 +51,7 @@ OBJS += ../Crypto/Serpent.o
OBJS += ../Crypto/Sha2.o
OBJS += ../Crypto/Twofish.o
OBJS += ../Crypto/Whirlpool.o
+OBJS += ../Crypto/Camellia.o
OBJS += ../Common/Crc.o
OBJS += ../Common/Endian.o