From 5a89c9290066f367302b129e1f1d7e0cc92c2b9c Mon Sep 17 00:00:00 2001
From: Thom Wiggers <thom@thomwiggers.nl>
Date: Fri, 29 May 2020 12:22:10 +0200
Subject: [PATCH] Add Keccakx4 to build

---
 .../avx2/Makefile.Microsoft_nmake                        | 9 ++++++++-
 .../avx2/Makefile.Microsoft_nmake                        | 9 ++++++++-
 .../avx2/Makefile.Microsoft_nmake                        | 9 ++++++++-
 .../avx2/Makefile.Microsoft_nmake                        | 9 ++++++++-
 .../avx2/Makefile.Microsoft_nmake                        | 9 ++++++++-
 .../avx2/Makefile.Microsoft_nmake                        | 9 ++++++++-
 .../avx2/Makefile.Microsoft_nmake                        | 9 ++++++++-
 .../avx2/Makefile.Microsoft_nmake                        | 9 ++++++++-
 .../avx2/Makefile.Microsoft_nmake                        | 9 ++++++++-
 .../avx2/Makefile.Microsoft_nmake                        | 9 ++++++++-
 .../avx2/Makefile.Microsoft_nmake                        | 9 ++++++++-
 .../avx2/Makefile.Microsoft_nmake                        | 9 ++++++++-
 12 files changed, 96 insertions(+), 12 deletions(-)

diff --git a/crypto_sign/sphincs-shake256-128f-robust/avx2/Makefile.Microsoft_nmake b/crypto_sign/sphincs-shake256-128f-robust/avx2/Makefile.Microsoft_nmake
index ab3d0254..a36cc7d2 100644
--- a/crypto_sign/sphincs-shake256-128f-robust/avx2/Makefile.Microsoft_nmake
+++ b/crypto_sign/sphincs-shake256-128f-robust/avx2/Makefile.Microsoft_nmake
@@ -4,6 +4,10 @@
 LIBRARY=libsphincs-shake256-128f-robust_avx2.lib
 OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fips202x4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_robust.obj hash_shake256x4.obj thash_shake256_robustx4.obj
 
+KECCAK4XDIR=..\..\..\common\keccak4x
+KECCAK4XOBJ=KeccakP-1600-times4-SIMD256.o
+KECCAK4X=$(KECCAK4XDIR)\$(KECCAK4XOBJ)
+
 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX
 
 all: $(LIBRARY)
@@ -11,9 +15,12 @@ all: $(LIBRARY)
 # Make sure objects are recompiled if headers change.
 $(OBJECTS): *.h
 
-$(LIBRARY): $(OBJECTS)
+$(LIBRARY): $(OBJECTS) $(KECCAKX4)
 	LIB.EXE /NOLOGO /WX /OUT:$@ $**
 
+$(KECCAK4X):
+	cd $(KECCAK4XDIR) && $(MAKE) $(KECCAK4XOBJ)
+
 clean:
     -DEL $(OBJECTS)
     -DEL $(LIBRARY)
diff --git a/crypto_sign/sphincs-shake256-128f-simple/avx2/Makefile.Microsoft_nmake b/crypto_sign/sphincs-shake256-128f-simple/avx2/Makefile.Microsoft_nmake
index 50db09e7..9ab50df7 100644
--- a/crypto_sign/sphincs-shake256-128f-simple/avx2/Makefile.Microsoft_nmake
+++ b/crypto_sign/sphincs-shake256-128f-simple/avx2/Makefile.Microsoft_nmake
@@ -4,6 +4,10 @@
 LIBRARY=libsphincs-shake256-128f-simple_avx2.lib
 OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fips202x4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_simple.obj hash_shake256x4.obj thash_shake256_simplex4.obj
 
+KECCAK4XDIR=..\..\..\common\keccak4x
+KECCAK4XOBJ=KeccakP-1600-times4-SIMD256.o
+KECCAK4X=$(KECCAK4XDIR)\$(KECCAK4XOBJ)
+
 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX
 
 all: $(LIBRARY)
@@ -11,9 +15,12 @@ all: $(LIBRARY)
 # Make sure objects are recompiled if headers change.
 $(OBJECTS): *.h
 
-$(LIBRARY): $(OBJECTS)
+$(LIBRARY): $(OBJECTS) $(KECCAKX4)
 	LIB.EXE /NOLOGO /WX /OUT:$@ $**
 
+$(KECCAK4X):
+	cd $(KECCAK4XDIR) && $(MAKE) $(KECCAK4XOBJ)
+
 clean:
     -DEL $(OBJECTS)
     -DEL $(LIBRARY)
diff --git a/crypto_sign/sphincs-shake256-128s-robust/avx2/Makefile.Microsoft_nmake b/crypto_sign/sphincs-shake256-128s-robust/avx2/Makefile.Microsoft_nmake
index 1bff6dc9..de29200a 100644
--- a/crypto_sign/sphincs-shake256-128s-robust/avx2/Makefile.Microsoft_nmake
+++ b/crypto_sign/sphincs-shake256-128s-robust/avx2/Makefile.Microsoft_nmake
@@ -4,6 +4,10 @@
 LIBRARY=libsphincs-shake256-128s-robust_avx2.lib
 OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fips202x4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_robust.obj hash_shake256x4.obj thash_shake256_robustx4.obj
 
+KECCAK4XDIR=..\..\..\common\keccak4x
+KECCAK4XOBJ=KeccakP-1600-times4-SIMD256.o
+KECCAK4X=$(KECCAK4XDIR)\$(KECCAK4XOBJ)
+
 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX
 
 all: $(LIBRARY)
@@ -11,9 +15,12 @@ all: $(LIBRARY)
 # Make sure objects are recompiled if headers change.
 $(OBJECTS): *.h
 
-$(LIBRARY): $(OBJECTS)
+$(LIBRARY): $(OBJECTS) $(KECCAKX4)
 	LIB.EXE /NOLOGO /WX /OUT:$@ $**
 
+$(KECCAK4X):
+	cd $(KECCAK4XDIR) && $(MAKE) $(KECCAK4XOBJ)
+
 clean:
     -DEL $(OBJECTS)
     -DEL $(LIBRARY)
diff --git a/crypto_sign/sphincs-shake256-128s-simple/avx2/Makefile.Microsoft_nmake b/crypto_sign/sphincs-shake256-128s-simple/avx2/Makefile.Microsoft_nmake
index 09477db8..d8b51035 100644
--- a/crypto_sign/sphincs-shake256-128s-simple/avx2/Makefile.Microsoft_nmake
+++ b/crypto_sign/sphincs-shake256-128s-simple/avx2/Makefile.Microsoft_nmake
@@ -4,6 +4,10 @@
 LIBRARY=libsphincs-shake256-128s-simple_avx2.lib
 OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fips202x4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_simple.obj hash_shake256x4.obj thash_shake256_simplex4.obj
 
+KECCAK4XDIR=..\..\..\common\keccak4x
+KECCAK4XOBJ=KeccakP-1600-times4-SIMD256.o
+KECCAK4X=$(KECCAK4XDIR)\$(KECCAK4XOBJ)
+
 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX
 
 all: $(LIBRARY)
@@ -11,9 +15,12 @@ all: $(LIBRARY)
 # Make sure objects are recompiled if headers change.
 $(OBJECTS): *.h
 
-$(LIBRARY): $(OBJECTS)
+$(LIBRARY): $(OBJECTS) $(KECCAKX4)
 	LIB.EXE /NOLOGO /WX /OUT:$@ $**
 
+$(KECCAK4X):
+	cd $(KECCAK4XDIR) && $(MAKE) $(KECCAK4XOBJ)
+
 clean:
     -DEL $(OBJECTS)
     -DEL $(LIBRARY)
diff --git a/crypto_sign/sphincs-shake256-192f-robust/avx2/Makefile.Microsoft_nmake b/crypto_sign/sphincs-shake256-192f-robust/avx2/Makefile.Microsoft_nmake
index 75d660e7..258fc8e6 100644
--- a/crypto_sign/sphincs-shake256-192f-robust/avx2/Makefile.Microsoft_nmake
+++ b/crypto_sign/sphincs-shake256-192f-robust/avx2/Makefile.Microsoft_nmake
@@ -4,6 +4,10 @@
 LIBRARY=libsphincs-shake256-192f-robust_avx2.lib
 OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fips202x4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_robust.obj hash_shake256x4.obj thash_shake256_robustx4.obj
 
+KECCAK4XDIR=..\..\..\common\keccak4x
+KECCAK4XOBJ=KeccakP-1600-times4-SIMD256.o
+KECCAK4X=$(KECCAK4XDIR)\$(KECCAK4XOBJ)
+
 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX
 
 all: $(LIBRARY)
@@ -11,9 +15,12 @@ all: $(LIBRARY)
 # Make sure objects are recompiled if headers change.
 $(OBJECTS): *.h
 
-$(LIBRARY): $(OBJECTS)
+$(LIBRARY): $(OBJECTS) $(KECCAKX4)
 	LIB.EXE /NOLOGO /WX /OUT:$@ $**
 
+$(KECCAK4X):
+	cd $(KECCAK4XDIR) && $(MAKE) $(KECCAK4XOBJ)
+
 clean:
     -DEL $(OBJECTS)
     -DEL $(LIBRARY)
diff --git a/crypto_sign/sphincs-shake256-192f-simple/avx2/Makefile.Microsoft_nmake b/crypto_sign/sphincs-shake256-192f-simple/avx2/Makefile.Microsoft_nmake
index 29af90d1..c5f44eb1 100644
--- a/crypto_sign/sphincs-shake256-192f-simple/avx2/Makefile.Microsoft_nmake
+++ b/crypto_sign/sphincs-shake256-192f-simple/avx2/Makefile.Microsoft_nmake
@@ -4,6 +4,10 @@
 LIBRARY=libsphincs-shake256-192f-simple_avx2.lib
 OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fips202x4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_simple.obj hash_shake256x4.obj thash_shake256_simplex4.obj
 
+KECCAK4XDIR=..\..\..\common\keccak4x
+KECCAK4XOBJ=KeccakP-1600-times4-SIMD256.o
+KECCAK4X=$(KECCAK4XDIR)\$(KECCAK4XOBJ)
+
 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX
 
 all: $(LIBRARY)
@@ -11,9 +15,12 @@ all: $(LIBRARY)
 # Make sure objects are recompiled if headers change.
 $(OBJECTS): *.h
 
-$(LIBRARY): $(OBJECTS)
+$(LIBRARY): $(OBJECTS) $(KECCAKX4)
 	LIB.EXE /NOLOGO /WX /OUT:$@ $**
 
+$(KECCAK4X):
+	cd $(KECCAK4XDIR) && $(MAKE) $(KECCAK4XOBJ)
+
 clean:
     -DEL $(OBJECTS)
     -DEL $(LIBRARY)
diff --git a/crypto_sign/sphincs-shake256-192s-robust/avx2/Makefile.Microsoft_nmake b/crypto_sign/sphincs-shake256-192s-robust/avx2/Makefile.Microsoft_nmake
index 2b12f0f2..9bfe65d1 100644
--- a/crypto_sign/sphincs-shake256-192s-robust/avx2/Makefile.Microsoft_nmake
+++ b/crypto_sign/sphincs-shake256-192s-robust/avx2/Makefile.Microsoft_nmake
@@ -4,6 +4,10 @@
 LIBRARY=libsphincs-shake256-192s-robust_avx2.lib
 OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fips202x4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_robust.obj hash_shake256x4.obj thash_shake256_robustx4.obj
 
+KECCAK4XDIR=..\..\..\common\keccak4x
+KECCAK4XOBJ=KeccakP-1600-times4-SIMD256.o
+KECCAK4X=$(KECCAK4XDIR)\$(KECCAK4XOBJ)
+
 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX
 
 all: $(LIBRARY)
@@ -11,9 +15,12 @@ all: $(LIBRARY)
 # Make sure objects are recompiled if headers change.
 $(OBJECTS): *.h
 
-$(LIBRARY): $(OBJECTS)
+$(LIBRARY): $(OBJECTS) $(KECCAKX4)
 	LIB.EXE /NOLOGO /WX /OUT:$@ $**
 
+$(KECCAK4X):
+	cd $(KECCAK4XDIR) && $(MAKE) $(KECCAK4XOBJ)
+
 clean:
     -DEL $(OBJECTS)
     -DEL $(LIBRARY)
diff --git a/crypto_sign/sphincs-shake256-192s-simple/avx2/Makefile.Microsoft_nmake b/crypto_sign/sphincs-shake256-192s-simple/avx2/Makefile.Microsoft_nmake
index 8d3c621b..920ee157 100644
--- a/crypto_sign/sphincs-shake256-192s-simple/avx2/Makefile.Microsoft_nmake
+++ b/crypto_sign/sphincs-shake256-192s-simple/avx2/Makefile.Microsoft_nmake
@@ -4,6 +4,10 @@
 LIBRARY=libsphincs-shake256-192s-simple_avx2.lib
 OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fips202x4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_simple.obj hash_shake256x4.obj thash_shake256_simplex4.obj
 
+KECCAK4XDIR=..\..\..\common\keccak4x
+KECCAK4XOBJ=KeccakP-1600-times4-SIMD256.o
+KECCAK4X=$(KECCAK4XDIR)\$(KECCAK4XOBJ)
+
 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX
 
 all: $(LIBRARY)
@@ -11,9 +15,12 @@ all: $(LIBRARY)
 # Make sure objects are recompiled if headers change.
 $(OBJECTS): *.h
 
-$(LIBRARY): $(OBJECTS)
+$(LIBRARY): $(OBJECTS) $(KECCAKX4)
 	LIB.EXE /NOLOGO /WX /OUT:$@ $**
 
+$(KECCAK4X):
+	cd $(KECCAK4XDIR) && $(MAKE) $(KECCAK4XOBJ)
+
 clean:
     -DEL $(OBJECTS)
     -DEL $(LIBRARY)
diff --git a/crypto_sign/sphincs-shake256-256f-robust/avx2/Makefile.Microsoft_nmake b/crypto_sign/sphincs-shake256-256f-robust/avx2/Makefile.Microsoft_nmake
index a8e77844..b7faf194 100644
--- a/crypto_sign/sphincs-shake256-256f-robust/avx2/Makefile.Microsoft_nmake
+++ b/crypto_sign/sphincs-shake256-256f-robust/avx2/Makefile.Microsoft_nmake
@@ -4,6 +4,10 @@
 LIBRARY=libsphincs-shake256-256f-robust_avx2.lib
 OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fips202x4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_robust.obj hash_shake256x4.obj thash_shake256_robustx4.obj
 
+KECCAK4XDIR=..\..\..\common\keccak4x
+KECCAK4XOBJ=KeccakP-1600-times4-SIMD256.o
+KECCAK4X=$(KECCAK4XDIR)\$(KECCAK4XOBJ)
+
 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX
 
 all: $(LIBRARY)
@@ -11,9 +15,12 @@ all: $(LIBRARY)
 # Make sure objects are recompiled if headers change.
 $(OBJECTS): *.h
 
-$(LIBRARY): $(OBJECTS)
+$(LIBRARY): $(OBJECTS) $(KECCAKX4)
 	LIB.EXE /NOLOGO /WX /OUT:$@ $**
 
+$(KECCAK4X):
+	cd $(KECCAK4XDIR) && $(MAKE) $(KECCAK4XOBJ)
+
 clean:
     -DEL $(OBJECTS)
     -DEL $(LIBRARY)
diff --git a/crypto_sign/sphincs-shake256-256f-simple/avx2/Makefile.Microsoft_nmake b/crypto_sign/sphincs-shake256-256f-simple/avx2/Makefile.Microsoft_nmake
index 2685fc5c..f9cad31e 100644
--- a/crypto_sign/sphincs-shake256-256f-simple/avx2/Makefile.Microsoft_nmake
+++ b/crypto_sign/sphincs-shake256-256f-simple/avx2/Makefile.Microsoft_nmake
@@ -4,6 +4,10 @@
 LIBRARY=libsphincs-shake256-256f-simple_avx2.lib
 OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fips202x4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_simple.obj hash_shake256x4.obj thash_shake256_simplex4.obj
 
+KECCAK4XDIR=..\..\..\common\keccak4x
+KECCAK4XOBJ=KeccakP-1600-times4-SIMD256.o
+KECCAK4X=$(KECCAK4XDIR)\$(KECCAK4XOBJ)
+
 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX
 
 all: $(LIBRARY)
@@ -11,9 +15,12 @@ all: $(LIBRARY)
 # Make sure objects are recompiled if headers change.
 $(OBJECTS): *.h
 
-$(LIBRARY): $(OBJECTS)
+$(LIBRARY): $(OBJECTS) $(KECCAKX4)
 	LIB.EXE /NOLOGO /WX /OUT:$@ $**
 
+$(KECCAK4X):
+	cd $(KECCAK4XDIR) && $(MAKE) $(KECCAK4XOBJ)
+
 clean:
     -DEL $(OBJECTS)
     -DEL $(LIBRARY)
diff --git a/crypto_sign/sphincs-shake256-256s-robust/avx2/Makefile.Microsoft_nmake b/crypto_sign/sphincs-shake256-256s-robust/avx2/Makefile.Microsoft_nmake
index 817778e2..463ba30d 100644
--- a/crypto_sign/sphincs-shake256-256s-robust/avx2/Makefile.Microsoft_nmake
+++ b/crypto_sign/sphincs-shake256-256s-robust/avx2/Makefile.Microsoft_nmake
@@ -4,6 +4,10 @@
 LIBRARY=libsphincs-shake256-256s-robust_avx2.lib
 OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fips202x4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_robust.obj hash_shake256x4.obj thash_shake256_robustx4.obj
 
+KECCAK4XDIR=..\..\..\common\keccak4x
+KECCAK4XOBJ=KeccakP-1600-times4-SIMD256.o
+KECCAK4X=$(KECCAK4XDIR)\$(KECCAK4XOBJ)
+
 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX
 
 all: $(LIBRARY)
@@ -11,9 +15,12 @@ all: $(LIBRARY)
 # Make sure objects are recompiled if headers change.
 $(OBJECTS): *.h
 
-$(LIBRARY): $(OBJECTS)
+$(LIBRARY): $(OBJECTS) $(KECCAKX4)
 	LIB.EXE /NOLOGO /WX /OUT:$@ $**
 
+$(KECCAK4X):
+	cd $(KECCAK4XDIR) && $(MAKE) $(KECCAK4XOBJ)
+
 clean:
     -DEL $(OBJECTS)
     -DEL $(LIBRARY)
diff --git a/crypto_sign/sphincs-shake256-256s-simple/avx2/Makefile.Microsoft_nmake b/crypto_sign/sphincs-shake256-256s-simple/avx2/Makefile.Microsoft_nmake
index febec07b..21567035 100644
--- a/crypto_sign/sphincs-shake256-256s-simple/avx2/Makefile.Microsoft_nmake
+++ b/crypto_sign/sphincs-shake256-256s-simple/avx2/Makefile.Microsoft_nmake
@@ -4,6 +4,10 @@
 LIBRARY=libsphincs-shake256-256s-simple_avx2.lib
 OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fips202x4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_simple.obj hash_shake256x4.obj thash_shake256_simplex4.obj
 
+KECCAK4XDIR=..\..\..\common\keccak4x
+KECCAK4XOBJ=KeccakP-1600-times4-SIMD256.o
+KECCAK4X=$(KECCAK4XDIR)\$(KECCAK4XOBJ)
+
 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX
 
 all: $(LIBRARY)
@@ -11,9 +15,12 @@ all: $(LIBRARY)
 # Make sure objects are recompiled if headers change.
 $(OBJECTS): *.h
 
-$(LIBRARY): $(OBJECTS)
+$(LIBRARY): $(OBJECTS) $(KECCAKX4)
 	LIB.EXE /NOLOGO /WX /OUT:$@ $**
 
+$(KECCAK4X):
+	cd $(KECCAK4XDIR) && $(MAKE) $(KECCAK4XOBJ)
+
 clean:
     -DEL $(OBJECTS)
     -DEL $(LIBRARY)