nihilist/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt synced 2024-11-28 14:03:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Linux/MacOSX: Solve compilation error linked to Camellia cipher addition.

Browse Source
This commit is contained in:
Mounir IDRASSI 2016-06-19 00:36:46 +02:00
parent 85cab3b85f
commit 45617a3285
No known key found for this signature in database
GPG Key ID: DD0C382D5FCFB8FC
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Crypto/Camellia.c
View File

@ -6,7 +6,7 @@ and released into public domain.
/* Adapted for VeraCrypt */ /* Adapted for VeraCrypt */
#include "camellia.h" #include "Camellia.h"
#include "Common/Endian.h" #include "Common/Endian.h"
#include "Crypto/misc.h" #include "Crypto/misc.h"

6
src/Volume/Cipher.cpp
View File

@ -245,12 +245,12 @@ namespace VeraCrypt
// Camellia // Camellia
void CipherCamellia::Decrypt (byte *data) const 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 void CipherCamellia::Encrypt (byte *data) const
{ {
camellia_encrypt (data, data, (uint64 *) ScheduledKey.Ptr()); camellia_encrypt (data, data, ScheduledKey.Ptr());
} }
size_t CipherCamellia::GetScheduledKeySize () const size_t CipherCamellia::GetScheduledKeySize () const
@ -260,7 +260,7 @@ namespace VeraCrypt
void CipherCamellia::SetCipherKey (const byte *key) void CipherCamellia::SetCipherKey (const byte *key)
{ {
camellia_set_key (key, (uint64 *) ScheduledKey.Ptr()); camellia_set_key (key, ScheduledKey.Ptr());
} }

1
src/Volume/Volume.make
View File

@ -51,6 +51,7 @@ OBJS += ../Crypto/Serpent.o
OBJS += ../Crypto/Sha2.o OBJS += ../Crypto/Sha2.o
OBJS += ../Crypto/Twofish.o OBJS += ../Crypto/Twofish.o
OBJS += ../Crypto/Whirlpool.o OBJS += ../Crypto/Whirlpool.o
OBJS += ../Crypto/Camellia.o
OBJS += ../Common/Crc.o OBJS += ../Common/Crc.o
OBJS += ../Common/Endian.o OBJS += ../Common/Endian.o