From 546d6cff4447a56bbf7c0e1a8b6f89dba5d3183b Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Fri, 23 Jun 2017 02:07:32 +0200
Subject: Crypto: Add optimized SHA-512 and SHA-256 assembly implementations
 for x86_64 and x86. This improves speed by 30%.

---
 src/Volume/Volume.make | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

(limited to 'src/Volume')

diff --git a/src/Volume/Volume.make b/src/Volume/Volume.make
index 0ecc7f42..e179c563 100644
--- a/src/Volume/Volume.make
+++ b/src/Volume/Volume.make
@@ -36,15 +36,32 @@ ifeq "$(PLATFORM)" "MacOSX"
     OBJSEX += ../Crypto/Twofish_asm.oo
     OBJSEX += ../Crypto/Camellia_asm.oo
 	OBJSEX += ../Crypto/Camellia_aesni_asm.oo
+	OBJS += ../Crypto/sha256-nayuki.oo
+	OBJS += ../Crypto/sha512-nayuki.oo
+	OBJS += ../Crypto/sha256_avx1.oo
+	OBJS += ../Crypto/sha256_avx2.oo
+	OBJS += ../Crypto/sha256_sse4.oo
+	OBJS += ../Crypto/sha512_avx1.oo
+	OBJS += ../Crypto/sha512_avx2.oo
+	OBJS += ../Crypto/sha512_sse4.oo
 else ifeq "$(CPU_ARCH)" "x86"
 	OBJS += ../Crypto/Aes_x86.o
 	OBJS += ../Crypto/Aes_hw_cpu.o
+	OBJS += ../Crypto/sha256-x86-nayuki.o
+	OBJS += ../Crypto/sha512-x86-nayuki.o
 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
+	OBJS += ../Crypto/sha512-x64-nayuki.o
+	OBJS += ../Crypto/sha256_avx1_x64.o
+	OBJS += ../Crypto/sha256_avx2_x64.o
+	OBJS += ../Crypto/sha256_sse4_x64.o
+	OBJS += ../Crypto/sha512_avx1_x64.o
+	OBJS += ../Crypto/sha512_avx2_x64.o
+	OBJS += ../Crypto/sha512_sse4_x64.o
 else
 	OBJS += ../Crypto/Aescrypt.o
 endif
@@ -87,6 +104,33 @@ ifeq "$(PLATFORM)" "MacOSX"
 ../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
+../Crypto/sha256-nayuki.oo: ../Crypto/sha256-x86-nayuki.S
+	@echo Assembling $(<F)
+	$(YASM) -p gas -f macho32 -o ../Crypto/sha256-nayuki.oo ../Crypto/sha256-x86-nayuki.S
+../Crypto/sha256_avx1.oo: ../Crypto/sha256_avx1_x64.asm
+	@echo Assembling $(<F)
+	$(YASM) -f macho64 -o ../Crypto/sha256_avx1.oo ../Crypto/sha256_avx1_x64.asm
+../Crypto/sha256_avx2.oo: ../Crypto/sha256_avx2_x64.asm
+	@echo Assembling $(<F)
+	$(YASM) -f macho64 -o ../Crypto/sha256_avx2.oo ../Crypto/sha256_avx2_x64.asm
+../Crypto/sha256_sse4.oo: ../Crypto/sha256_sse4_x64.asm
+	@echo Assembling $(<F)
+	$(YASM) -f macho64 -o ../Crypto/sha256_sse4.oo ../Crypto/sha256_sse4_x64.asm
+../Crypto/sha512-nayuki.oo: ../Crypto/sha512-x86-nayuki.S ../Crypto/sha512-x64-nayuki.S
+	@echo Assembling $(<F)
+	$(YASM) -p gas -f macho32 -o ../Crypto/sha512-x86-nayuki.o ../Crypto/sha512-x86-nayuki.S
+	$(YASM) -p gas -f macho64 -o ../Crypto/sha512-x64-nayuki.o ../Crypto/sha512-x64-nayuki.S
+	lipo -create ../Crypto/sha512-x64-nayuki.o ../Crypto/sha512-x64-nayuki.o -output ../Crypto/sha512-nayuki.oo
+	rm -fr ../Crypto/sha512-x86-nayuki.o ../Crypto/sha512-x64-nayuki.o
+../Crypto/sha512_avx1.oo: ../Crypto/sha512_avx1_x64.asm
+	@echo Assembling $(<F)
+	$(YASM) -f macho64 -o ../Crypto/sha512_avx1.oo ../Crypto/sha512_avx1_x64.asm
+../Crypto/sha512_avx2.oo: ../Crypto/sha512_avx2_x64.asm
+	@echo Assembling $(<F)
+	$(YASM) -f macho64 -o ../Crypto/sha512_avx2.oo ../Crypto/sha512_avx2_x64.asm
+../Crypto/sha512_sse4.oo: ../Crypto/sha512_sse4_x64.asm
+	@echo Assembling $(<F)
+	$(YASM) -f macho64 -o ../Crypto/sha512_sse4.oo ../Crypto/sha512_sse4_x64.asm
 endif
 
 include $(BUILD_INC)/Makefile.inc
-- 
cgit v1.2.3