Add Keccakx4 to build

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)