VeraCrypt
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2016-06-19 00:36:46 +0200
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2016-06-19 00:38:20 +0200
commit45617a3285430c7a3961b78234713f457c088bda (patch)
tree45482e4f7d041a3abc956460be37d88ccc805b6c
parent85cab3b85f1d95fe54958c4bd207976dec027dd9 (diff)
downloadVeraCrypt-45617a3285430c7a3961b78234713f457c088bda.tar.gz
VeraCrypt-45617a3285430c7a3961b78234713f457c088bda.zip
Linux/MacOSX: Solve compilation error linked to Camellia cipher addition.
-rw-r--r--src/Crypto/Camellia.c2
-rw-r--r--src/Volume/Cipher.cpp6
-rw-r--r--src/Volume/Volume.make1
3 files changed, 5 insertions, 4 deletions
diff --git a/src/Crypto/Camellia.c b/src/Crypto/Camellia.c
index 3c718708..33cf818c 100644
--- a/src/Crypto/Camellia.c
+++ b/src/Crypto/Camellia.c
@@ -6,7 +6,7 @@ and released into public domain.
/* Adapted for VeraCrypt */
-#include "camellia.h"
+#include "Camellia.h"
#include "Common/Endian.h"
#include "Crypto/misc.h"
diff --git a/src/Volume/Cipher.cpp b/src/Volume/Cipher.cpp
index 2f3594ab..743ef34c 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 0ef42ac7..2888db78 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