diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2017-06-20 17:43:35 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2017-06-21 01:39:55 +0200 |
| commit | 70097ecfe54a9630e1e77fdc30204a5460228193 (patch) | |
| tree | f43481a6ede0e0fcd81f8ba02006613d02d23032 /src/Volume/Volume.make | |
| parent | ee5c1784ea0ed1328f7607bf3ea619ef3bd96d03 (diff) | |
| download | VeraCrypt-70097ecfe54a9630e1e77fdc30204a5460228193.tar.gz VeraCrypt-70097ecfe54a9630e1e77fdc30204a5460228193.zip | |
Crypto: Add optimized Camellia assembly implementation for x86_64 based on work by Jussi Kivilinna (https://github.com/jkivilin/supercop-blockciphers). This improve speed by a factor of 2.5 when AES-NI supported by CPU and by 30% if AES-NI not supported.
Diffstat (limited to 'src/Volume/Volume.make')
| -rw-r--r-- | src/Volume/Volume.make | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/Volume/Volume.make b/src/Volume/Volume.make index 40f1281d..0ecc7f42 100644 --- a/src/Volume/Volume.make +++ b/src/Volume/Volume.make @@ -34,6 +34,8 @@ ifeq "$(PLATFORM)" "MacOSX" OBJS += ../Crypto/Aes_hw_cpu.o OBJS += ../Crypto/Aescrypt.o OBJSEX += ../Crypto/Twofish_asm.oo + OBJSEX += ../Crypto/Camellia_asm.oo + OBJSEX += ../Crypto/Camellia_aesni_asm.oo else ifeq "$(CPU_ARCH)" "x86" OBJS += ../Crypto/Aes_x86.o OBJS += ../Crypto/Aes_hw_cpu.o @@ -41,6 +43,8 @@ else ifeq "$(CPU_ARCH)" "x64" OBJS += ../Crypto/Aes_x64.o OBJS += ../Crypto/Aes_hw_cpu.o OBJS += ../Crypto/Twofish_x64.o + OBJS += ../Crypto/Camellia_x64.o + OBJS += ../Crypto/Camellia_aesni_x64.o else OBJS += ../Crypto/Aescrypt.o endif @@ -77,6 +81,12 @@ ifeq "$(PLATFORM)" "MacOSX" ../Crypto/Twofish_asm.oo: ../Crypto/Twofish_x64.S @echo Assembling $(<F) $(YASM) -p gas -f macho64 -o ../Crypto/Twofish_asm.oo ../Crypto/Twofish_x64.S +../Crypto/Camellia_asm.oo: ../Crypto/Camellia_x64.S + @echo Assembling $(<F) + $(YASM) -p gas -f macho64 -o ../Crypto/Camellia_asm.oo ../Crypto/Camellia_x64.S +../Crypto/Camellia_aesni_asm.oo: ../Crypto/Camellia_aesni_x64.S + @echo Assembling $(<F) + $(YASM) -p gas -f macho64 -o ../Crypto/Camellia_aesni_asm.oo ../Crypto/Camellia_aesni_x64.S endif include $(BUILD_INC)/Makefile.inc |