From d4d6d09ff78c542b53d4766c7a5a4b08fb13bbdd Mon Sep 17 00:00:00 2001 From: Thom Wiggers Date: Fri, 29 May 2020 12:08:57 +0200 Subject: [PATCH] Fix makefiles --- .../sphincs-sha256-128f-robust/avx2/Makefile.Microsoft_nmake | 2 +- .../sphincs-sha256-128f-simple/avx2/Makefile.Microsoft_nmake | 2 +- .../sphincs-sha256-128s-robust/avx2/Makefile.Microsoft_nmake | 2 +- .../sphincs-sha256-128s-simple/avx2/Makefile.Microsoft_nmake | 2 +- .../sphincs-sha256-192f-robust/avx2/Makefile.Microsoft_nmake | 2 +- .../sphincs-sha256-192f-simple/avx2/Makefile.Microsoft_nmake | 2 +- .../sphincs-sha256-192s-robust/avx2/Makefile.Microsoft_nmake | 2 +- .../sphincs-sha256-192s-simple/avx2/Makefile.Microsoft_nmake | 2 +- .../sphincs-sha256-256f-robust/avx2/Makefile.Microsoft_nmake | 2 +- .../sphincs-sha256-256f-simple/avx2/Makefile.Microsoft_nmake | 2 +- .../sphincs-sha256-256s-robust/avx2/Makefile.Microsoft_nmake | 2 +- .../sphincs-sha256-256s-simple/avx2/Makefile.Microsoft_nmake | 2 +- crypto_sign/sphincs-shake256-128f-robust/avx2/Makefile | 2 +- .../sphincs-shake256-128f-robust/avx2/Makefile.Microsoft_nmake | 2 +- crypto_sign/sphincs-shake256-128f-simple/avx2/Makefile | 2 +- .../sphincs-shake256-128f-simple/avx2/Makefile.Microsoft_nmake | 2 +- crypto_sign/sphincs-shake256-128s-robust/avx2/Makefile | 2 +- .../sphincs-shake256-128s-robust/avx2/Makefile.Microsoft_nmake | 2 +- crypto_sign/sphincs-shake256-128s-simple/avx2/Makefile | 2 +- .../sphincs-shake256-128s-simple/avx2/Makefile.Microsoft_nmake | 2 +- crypto_sign/sphincs-shake256-192f-robust/avx2/Makefile | 2 +- .../sphincs-shake256-192f-robust/avx2/Makefile.Microsoft_nmake | 2 +- crypto_sign/sphincs-shake256-192f-simple/avx2/Makefile | 2 +- .../sphincs-shake256-192f-simple/avx2/Makefile.Microsoft_nmake | 2 +- crypto_sign/sphincs-shake256-192s-robust/avx2/Makefile | 2 +- .../sphincs-shake256-192s-robust/avx2/Makefile.Microsoft_nmake | 2 +- crypto_sign/sphincs-shake256-192s-simple/avx2/Makefile | 2 +- .../sphincs-shake256-192s-simple/avx2/Makefile.Microsoft_nmake | 2 +- crypto_sign/sphincs-shake256-256f-robust/avx2/Makefile | 2 +- .../sphincs-shake256-256f-robust/avx2/Makefile.Microsoft_nmake | 2 +- crypto_sign/sphincs-shake256-256f-simple/avx2/Makefile | 2 +- .../sphincs-shake256-256f-simple/avx2/Makefile.Microsoft_nmake | 2 +- crypto_sign/sphincs-shake256-256s-robust/avx2/Makefile | 2 +- .../sphincs-shake256-256s-robust/avx2/Makefile.Microsoft_nmake | 2 +- crypto_sign/sphincs-shake256-256s-simple/avx2/Makefile | 2 +- .../sphincs-shake256-256s-simple/avx2/Makefile.Microsoft_nmake | 2 +- 36 files changed, 36 insertions(+), 36 deletions(-) diff --git a/crypto_sign/sphincs-sha256-128f-robust/avx2/Makefile.Microsoft_nmake b/crypto_sign/sphincs-sha256-128f-robust/avx2/Makefile.Microsoft_nmake index 77b9110e..b4424563 100644 --- a/crypto_sign/sphincs-sha256-128f-robust/avx2/Makefile.Microsoft_nmake +++ b/crypto_sign/sphincs-sha256-128f-robust/avx2/Makefile.Microsoft_nmake @@ -2,7 +2,7 @@ # nmake /f Makefile.Microsoft_nmake LIBRARY=libsphincs-sha256-128f-robust_avx2.lib -OBJECTS=address.obj wots.obj utils.obj utilsx8.obj fors.obj sign.obj hash_sha256.obj thash_sha256_robust.obj hash_sha256x8.obj thash_sha256_robustx8.obj sha256.obj +OBJECTS=address.obj wots.obj utils.obj utilsx8.obj sha256avx.obj sha256x8.obj fors.obj hash_sha256x8.obj sign.obj hash_sha256.obj thash_sha256_robust.obj hash_sha256x8.obj thash_sha256_robustx8.obj sha256.obj CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX diff --git a/crypto_sign/sphincs-sha256-128f-simple/avx2/Makefile.Microsoft_nmake b/crypto_sign/sphincs-sha256-128f-simple/avx2/Makefile.Microsoft_nmake index 7f3c4162..1192cf79 100644 --- a/crypto_sign/sphincs-sha256-128f-simple/avx2/Makefile.Microsoft_nmake +++ b/crypto_sign/sphincs-sha256-128f-simple/avx2/Makefile.Microsoft_nmake @@ -2,7 +2,7 @@ # nmake /f Makefile.Microsoft_nmake LIBRARY=libsphincs-sha256-128f-simple_avx2.lib -OBJECTS=address.obj wots.obj utils.obj utilsx8.obj fors.obj sign.obj hash_sha256.obj thash_sha256_simple.obj hash_sha256x8.obj thash_sha256_simplex8.obj sha256.obj +OBJECTS=address.obj wots.obj utils.obj utilsx8.obj sha256avx.obj sha256x8.obj fors.obj hash_sha256x8.obj sign.obj hash_sha256.obj thash_sha256_simple.obj hash_sha256x8.obj thash_sha256_simplex8.obj sha256.obj CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX diff --git a/crypto_sign/sphincs-sha256-128s-robust/avx2/Makefile.Microsoft_nmake b/crypto_sign/sphincs-sha256-128s-robust/avx2/Makefile.Microsoft_nmake index 305ecd6b..49cfd1c6 100644 --- a/crypto_sign/sphincs-sha256-128s-robust/avx2/Makefile.Microsoft_nmake +++ b/crypto_sign/sphincs-sha256-128s-robust/avx2/Makefile.Microsoft_nmake @@ -2,7 +2,7 @@ # nmake /f Makefile.Microsoft_nmake LIBRARY=libsphincs-sha256-128s-robust_avx2.lib -OBJECTS=address.obj wots.obj utils.obj utilsx8.obj fors.obj sign.obj hash_sha256.obj thash_sha256_robust.obj hash_sha256x8.obj thash_sha256_robustx8.obj sha256.obj +OBJECTS=address.obj wots.obj utils.obj utilsx8.obj sha256avx.obj sha256x8.obj fors.obj hash_sha256x8.obj sign.obj hash_sha256.obj thash_sha256_robust.obj hash_sha256x8.obj thash_sha256_robustx8.obj sha256.obj CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX diff --git a/crypto_sign/sphincs-sha256-128s-simple/avx2/Makefile.Microsoft_nmake b/crypto_sign/sphincs-sha256-128s-simple/avx2/Makefile.Microsoft_nmake index 43f3ad65..3202ecd6 100644 --- a/crypto_sign/sphincs-sha256-128s-simple/avx2/Makefile.Microsoft_nmake +++ b/crypto_sign/sphincs-sha256-128s-simple/avx2/Makefile.Microsoft_nmake @@ -2,7 +2,7 @@ # nmake /f Makefile.Microsoft_nmake LIBRARY=libsphincs-sha256-128s-simple_avx2.lib -OBJECTS=address.obj wots.obj utils.obj utilsx8.obj fors.obj sign.obj hash_sha256.obj thash_sha256_simple.obj hash_sha256x8.obj thash_sha256_simplex8.obj sha256.obj +OBJECTS=address.obj wots.obj utils.obj utilsx8.obj sha256avx.obj sha256x8.obj fors.obj hash_sha256x8.obj sign.obj hash_sha256.obj thash_sha256_simple.obj hash_sha256x8.obj thash_sha256_simplex8.obj sha256.obj CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX diff --git a/crypto_sign/sphincs-sha256-192f-robust/avx2/Makefile.Microsoft_nmake b/crypto_sign/sphincs-sha256-192f-robust/avx2/Makefile.Microsoft_nmake index 12466225..4d95789e 100644 --- a/crypto_sign/sphincs-sha256-192f-robust/avx2/Makefile.Microsoft_nmake +++ b/crypto_sign/sphincs-sha256-192f-robust/avx2/Makefile.Microsoft_nmake @@ -2,7 +2,7 @@ # nmake /f Makefile.Microsoft_nmake LIBRARY=libsphincs-sha256-192f-robust_avx2.lib -OBJECTS=address.obj wots.obj utils.obj utilsx8.obj fors.obj sign.obj hash_sha256.obj thash_sha256_robust.obj hash_sha256x8.obj thash_sha256_robustx8.obj sha256.obj +OBJECTS=address.obj wots.obj utils.obj utilsx8.obj sha256avx.obj sha256x8.obj fors.obj hash_sha256x8.obj sign.obj hash_sha256.obj thash_sha256_robust.obj hash_sha256x8.obj thash_sha256_robustx8.obj sha256.obj CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX diff --git a/crypto_sign/sphincs-sha256-192f-simple/avx2/Makefile.Microsoft_nmake b/crypto_sign/sphincs-sha256-192f-simple/avx2/Makefile.Microsoft_nmake index 971e24d5..97d4df52 100644 --- a/crypto_sign/sphincs-sha256-192f-simple/avx2/Makefile.Microsoft_nmake +++ b/crypto_sign/sphincs-sha256-192f-simple/avx2/Makefile.Microsoft_nmake @@ -2,7 +2,7 @@ # nmake /f Makefile.Microsoft_nmake LIBRARY=libsphincs-sha256-192f-simple_avx2.lib -OBJECTS=address.obj wots.obj utils.obj utilsx8.obj fors.obj sign.obj hash_sha256.obj thash_sha256_simple.obj hash_sha256x8.obj thash_sha256_simplex8.obj sha256.obj +OBJECTS=address.obj wots.obj utils.obj utilsx8.obj sha256avx.obj sha256x8.obj fors.obj hash_sha256x8.obj sign.obj hash_sha256.obj thash_sha256_simple.obj hash_sha256x8.obj thash_sha256_simplex8.obj sha256.obj CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX diff --git a/crypto_sign/sphincs-sha256-192s-robust/avx2/Makefile.Microsoft_nmake b/crypto_sign/sphincs-sha256-192s-robust/avx2/Makefile.Microsoft_nmake index 81c115c9..252320df 100644 --- a/crypto_sign/sphincs-sha256-192s-robust/avx2/Makefile.Microsoft_nmake +++ b/crypto_sign/sphincs-sha256-192s-robust/avx2/Makefile.Microsoft_nmake @@ -2,7 +2,7 @@ # nmake /f Makefile.Microsoft_nmake LIBRARY=libsphincs-sha256-192s-robust_avx2.lib -OBJECTS=address.obj wots.obj utils.obj utilsx8.obj fors.obj sign.obj hash_sha256.obj thash_sha256_robust.obj hash_sha256x8.obj thash_sha256_robustx8.obj sha256.obj +OBJECTS=address.obj wots.obj utils.obj utilsx8.obj sha256avx.obj sha256x8.obj fors.obj hash_sha256x8.obj sign.obj hash_sha256.obj thash_sha256_robust.obj hash_sha256x8.obj thash_sha256_robustx8.obj sha256.obj CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX diff --git a/crypto_sign/sphincs-sha256-192s-simple/avx2/Makefile.Microsoft_nmake b/crypto_sign/sphincs-sha256-192s-simple/avx2/Makefile.Microsoft_nmake index 3082da8c..e75efc8b 100644 --- a/crypto_sign/sphincs-sha256-192s-simple/avx2/Makefile.Microsoft_nmake +++ b/crypto_sign/sphincs-sha256-192s-simple/avx2/Makefile.Microsoft_nmake @@ -2,7 +2,7 @@ # nmake /f Makefile.Microsoft_nmake LIBRARY=libsphincs-sha256-192s-simple_avx2.lib -OBJECTS=address.obj wots.obj utils.obj utilsx8.obj fors.obj sign.obj hash_sha256.obj thash_sha256_simple.obj hash_sha256x8.obj thash_sha256_simplex8.obj sha256.obj +OBJECTS=address.obj wots.obj utils.obj utilsx8.obj sha256avx.obj sha256x8.obj fors.obj hash_sha256x8.obj sign.obj hash_sha256.obj thash_sha256_simple.obj hash_sha256x8.obj thash_sha256_simplex8.obj sha256.obj CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX diff --git a/crypto_sign/sphincs-sha256-256f-robust/avx2/Makefile.Microsoft_nmake b/crypto_sign/sphincs-sha256-256f-robust/avx2/Makefile.Microsoft_nmake index 27493261..82fc0a60 100644 --- a/crypto_sign/sphincs-sha256-256f-robust/avx2/Makefile.Microsoft_nmake +++ b/crypto_sign/sphincs-sha256-256f-robust/avx2/Makefile.Microsoft_nmake @@ -2,7 +2,7 @@ # nmake /f Makefile.Microsoft_nmake LIBRARY=libsphincs-sha256-256f-robust_avx2.lib -OBJECTS=address.obj wots.obj utils.obj utilsx8.obj fors.obj sign.obj hash_sha256.obj thash_sha256_robust.obj hash_sha256x8.obj thash_sha256_robustx8.obj sha256.obj +OBJECTS=address.obj wots.obj utils.obj utilsx8.obj sha256avx.obj sha256x8.obj fors.obj hash_sha256x8.obj sign.obj hash_sha256.obj thash_sha256_robust.obj hash_sha256x8.obj thash_sha256_robustx8.obj sha256.obj CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX diff --git a/crypto_sign/sphincs-sha256-256f-simple/avx2/Makefile.Microsoft_nmake b/crypto_sign/sphincs-sha256-256f-simple/avx2/Makefile.Microsoft_nmake index 54a6ac1c..3065c3cf 100644 --- a/crypto_sign/sphincs-sha256-256f-simple/avx2/Makefile.Microsoft_nmake +++ b/crypto_sign/sphincs-sha256-256f-simple/avx2/Makefile.Microsoft_nmake @@ -2,7 +2,7 @@ # nmake /f Makefile.Microsoft_nmake LIBRARY=libsphincs-sha256-256f-simple_avx2.lib -OBJECTS=address.obj wots.obj utils.obj utilsx8.obj fors.obj sign.obj hash_sha256.obj thash_sha256_simple.obj hash_sha256x8.obj thash_sha256_simplex8.obj sha256.obj +OBJECTS=address.obj wots.obj utils.obj utilsx8.obj sha256avx.obj sha256x8.obj fors.obj hash_sha256x8.obj sign.obj hash_sha256.obj thash_sha256_simple.obj hash_sha256x8.obj thash_sha256_simplex8.obj sha256.obj CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX diff --git a/crypto_sign/sphincs-sha256-256s-robust/avx2/Makefile.Microsoft_nmake b/crypto_sign/sphincs-sha256-256s-robust/avx2/Makefile.Microsoft_nmake index ac557390..bf3fb02c 100644 --- a/crypto_sign/sphincs-sha256-256s-robust/avx2/Makefile.Microsoft_nmake +++ b/crypto_sign/sphincs-sha256-256s-robust/avx2/Makefile.Microsoft_nmake @@ -2,7 +2,7 @@ # nmake /f Makefile.Microsoft_nmake LIBRARY=libsphincs-sha256-256s-robust_avx2.lib -OBJECTS=address.obj wots.obj utils.obj utilsx8.obj fors.obj sign.obj hash_sha256.obj thash_sha256_robust.obj hash_sha256x8.obj thash_sha256_robustx8.obj sha256.obj +OBJECTS=address.obj wots.obj utils.obj utilsx8.obj sha256avx.obj sha256x8.obj fors.obj hash_sha256x8.obj sign.obj hash_sha256.obj thash_sha256_robust.obj hash_sha256x8.obj thash_sha256_robustx8.obj sha256.obj CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX diff --git a/crypto_sign/sphincs-sha256-256s-simple/avx2/Makefile.Microsoft_nmake b/crypto_sign/sphincs-sha256-256s-simple/avx2/Makefile.Microsoft_nmake index 5eb9853a..b8b2cbff 100644 --- a/crypto_sign/sphincs-sha256-256s-simple/avx2/Makefile.Microsoft_nmake +++ b/crypto_sign/sphincs-sha256-256s-simple/avx2/Makefile.Microsoft_nmake @@ -2,7 +2,7 @@ # nmake /f Makefile.Microsoft_nmake LIBRARY=libsphincs-sha256-256s-simple_avx2.lib -OBJECTS=address.obj wots.obj utils.obj utilsx8.obj fors.obj sign.obj hash_sha256.obj thash_sha256_simple.obj hash_sha256x8.obj thash_sha256_simplex8.obj sha256.obj +OBJECTS=address.obj wots.obj utils.obj utilsx8.obj sha256avx.obj sha256x8.obj fors.obj hash_sha256x8.obj sign.obj hash_sha256.obj thash_sha256_simple.obj hash_sha256x8.obj thash_sha256_simplex8.obj sha256.obj CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX diff --git a/crypto_sign/sphincs-shake256-128f-robust/avx2/Makefile b/crypto_sign/sphincs-shake256-128f-robust/avx2/Makefile index 2eb6dcdd..8f3080bf 100644 --- a/crypto_sign/sphincs-shake256-128f-robust/avx2/Makefile +++ b/crypto_sign/sphincs-shake256-128f-robust/avx2/Makefile @@ -3,7 +3,7 @@ LIB=libsphincs-shake256-128f-robust_avx2.a HEADERS = params.h address.h wots.h utils.h utilsx4.h fips202x4.h fors.h api.h hash.h hashx4.h hash_state.h thash.h thashx4.h -OBJECTS = address.o wots.o utils.o utilsx4.o fips202x4.o fors.o hash_shake256x4.o sign.o hash_shake256.o thash_shake256_robust.o hash_shake256x4.o thash_shake256_robustx4.o +OBJECTS = address.o wots.o utils.o utilsx4.o fips202x4.o fors.o sign.o hash_shake256.o thash_shake256_robust.o hash_shake256x4.o thash_shake256_robustx4.o KECCAK4XDIR=../../../common/keccak4x KECCAK4XOBJ=KeccakP-1600-times4-SIMD256.o 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 829ac50b..ab3d0254 100644 --- a/crypto_sign/sphincs-shake256-128f-robust/avx2/Makefile.Microsoft_nmake +++ b/crypto_sign/sphincs-shake256-128f-robust/avx2/Makefile.Microsoft_nmake @@ -2,7 +2,7 @@ # nmake /f Makefile.Microsoft_nmake LIBRARY=libsphincs-shake256-128f-robust_avx2.lib -OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_robust.obj hash_shake256x4.obj thash_shake256_robustx4.obj +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 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX diff --git a/crypto_sign/sphincs-shake256-128f-simple/avx2/Makefile b/crypto_sign/sphincs-shake256-128f-simple/avx2/Makefile index 159d9c50..9791e97b 100644 --- a/crypto_sign/sphincs-shake256-128f-simple/avx2/Makefile +++ b/crypto_sign/sphincs-shake256-128f-simple/avx2/Makefile @@ -3,7 +3,7 @@ LIB=libsphincs-shake256-128f-simple_avx2.a HEADERS = params.h address.h wots.h utils.h utilsx4.h fips202x4.h fors.h api.h hash.h hashx4.h hash_state.h thash.h thashx4.h -OBJECTS = address.o wots.o utils.o utilsx4.o fips202x4.o fors.o hash_shake256x4.o sign.o hash_shake256.o thash_shake256_simple.o hash_shake256x4.o thash_shake256_simplex4.o +OBJECTS = address.o wots.o utils.o utilsx4.o fips202x4.o fors.o sign.o hash_shake256.o thash_shake256_simple.o hash_shake256x4.o thash_shake256_simplex4.o KECCAK4XDIR=../../../common/keccak4x KECCAK4XOBJ=KeccakP-1600-times4-SIMD256.o 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 7d67c9dd..50db09e7 100644 --- a/crypto_sign/sphincs-shake256-128f-simple/avx2/Makefile.Microsoft_nmake +++ b/crypto_sign/sphincs-shake256-128f-simple/avx2/Makefile.Microsoft_nmake @@ -2,7 +2,7 @@ # nmake /f Makefile.Microsoft_nmake LIBRARY=libsphincs-shake256-128f-simple_avx2.lib -OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_simple.obj hash_shake256x4.obj thash_shake256_simplex4.obj +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 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX diff --git a/crypto_sign/sphincs-shake256-128s-robust/avx2/Makefile b/crypto_sign/sphincs-shake256-128s-robust/avx2/Makefile index ede0245d..4aec0525 100644 --- a/crypto_sign/sphincs-shake256-128s-robust/avx2/Makefile +++ b/crypto_sign/sphincs-shake256-128s-robust/avx2/Makefile @@ -3,7 +3,7 @@ LIB=libsphincs-shake256-128s-robust_avx2.a HEADERS = params.h address.h wots.h utils.h utilsx4.h fips202x4.h fors.h api.h hash.h hashx4.h hash_state.h thash.h thashx4.h -OBJECTS = address.o wots.o utils.o utilsx4.o fips202x4.o fors.o hash_shake256x4.o sign.o hash_shake256.o thash_shake256_robust.o hash_shake256x4.o thash_shake256_robustx4.o +OBJECTS = address.o wots.o utils.o utilsx4.o fips202x4.o fors.o sign.o hash_shake256.o thash_shake256_robust.o hash_shake256x4.o thash_shake256_robustx4.o KECCAK4XDIR=../../../common/keccak4x KECCAK4XOBJ=KeccakP-1600-times4-SIMD256.o 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 5575777b..1bff6dc9 100644 --- a/crypto_sign/sphincs-shake256-128s-robust/avx2/Makefile.Microsoft_nmake +++ b/crypto_sign/sphincs-shake256-128s-robust/avx2/Makefile.Microsoft_nmake @@ -2,7 +2,7 @@ # nmake /f Makefile.Microsoft_nmake LIBRARY=libsphincs-shake256-128s-robust_avx2.lib -OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_robust.obj hash_shake256x4.obj thash_shake256_robustx4.obj +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 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX diff --git a/crypto_sign/sphincs-shake256-128s-simple/avx2/Makefile b/crypto_sign/sphincs-shake256-128s-simple/avx2/Makefile index 84b350d9..806ea97f 100644 --- a/crypto_sign/sphincs-shake256-128s-simple/avx2/Makefile +++ b/crypto_sign/sphincs-shake256-128s-simple/avx2/Makefile @@ -3,7 +3,7 @@ LIB=libsphincs-shake256-128s-simple_avx2.a HEADERS = params.h address.h wots.h utils.h utilsx4.h fips202x4.h fors.h api.h hash.h hashx4.h hash_state.h thash.h thashx4.h -OBJECTS = address.o wots.o utils.o utilsx4.o fips202x4.o fors.o hash_shake256x4.o sign.o hash_shake256.o thash_shake256_simple.o hash_shake256x4.o thash_shake256_simplex4.o +OBJECTS = address.o wots.o utils.o utilsx4.o fips202x4.o fors.o sign.o hash_shake256.o thash_shake256_simple.o hash_shake256x4.o thash_shake256_simplex4.o KECCAK4XDIR=../../../common/keccak4x KECCAK4XOBJ=KeccakP-1600-times4-SIMD256.o 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 88963d45..09477db8 100644 --- a/crypto_sign/sphincs-shake256-128s-simple/avx2/Makefile.Microsoft_nmake +++ b/crypto_sign/sphincs-shake256-128s-simple/avx2/Makefile.Microsoft_nmake @@ -2,7 +2,7 @@ # nmake /f Makefile.Microsoft_nmake LIBRARY=libsphincs-shake256-128s-simple_avx2.lib -OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_simple.obj hash_shake256x4.obj thash_shake256_simplex4.obj +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 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX diff --git a/crypto_sign/sphincs-shake256-192f-robust/avx2/Makefile b/crypto_sign/sphincs-shake256-192f-robust/avx2/Makefile index da643c8e..ddb7ffaa 100644 --- a/crypto_sign/sphincs-shake256-192f-robust/avx2/Makefile +++ b/crypto_sign/sphincs-shake256-192f-robust/avx2/Makefile @@ -3,7 +3,7 @@ LIB=libsphincs-shake256-192f-robust_avx2.a HEADERS = params.h address.h wots.h utils.h utilsx4.h fips202x4.h fors.h api.h hash.h hashx4.h hash_state.h thash.h thashx4.h -OBJECTS = address.o wots.o utils.o utilsx4.o fips202x4.o fors.o hash_shake256x4.o sign.o hash_shake256.o thash_shake256_robust.o hash_shake256x4.o thash_shake256_robustx4.o +OBJECTS = address.o wots.o utils.o utilsx4.o fips202x4.o fors.o sign.o hash_shake256.o thash_shake256_robust.o hash_shake256x4.o thash_shake256_robustx4.o KECCAK4XDIR=../../../common/keccak4x KECCAK4XOBJ=KeccakP-1600-times4-SIMD256.o 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 304f8cd3..75d660e7 100644 --- a/crypto_sign/sphincs-shake256-192f-robust/avx2/Makefile.Microsoft_nmake +++ b/crypto_sign/sphincs-shake256-192f-robust/avx2/Makefile.Microsoft_nmake @@ -2,7 +2,7 @@ # nmake /f Makefile.Microsoft_nmake LIBRARY=libsphincs-shake256-192f-robust_avx2.lib -OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_robust.obj hash_shake256x4.obj thash_shake256_robustx4.obj +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 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX diff --git a/crypto_sign/sphincs-shake256-192f-simple/avx2/Makefile b/crypto_sign/sphincs-shake256-192f-simple/avx2/Makefile index 27cc3c11..8b4b2d14 100644 --- a/crypto_sign/sphincs-shake256-192f-simple/avx2/Makefile +++ b/crypto_sign/sphincs-shake256-192f-simple/avx2/Makefile @@ -3,7 +3,7 @@ LIB=libsphincs-shake256-192f-simple_avx2.a HEADERS = params.h address.h wots.h utils.h utilsx4.h fips202x4.h fors.h api.h hash.h hashx4.h hash_state.h thash.h thashx4.h -OBJECTS = address.o wots.o utils.o utilsx4.o fips202x4.o fors.o hash_shake256x4.o sign.o hash_shake256.o thash_shake256_simple.o hash_shake256x4.o thash_shake256_simplex4.o +OBJECTS = address.o wots.o utils.o utilsx4.o fips202x4.o fors.o sign.o hash_shake256.o thash_shake256_simple.o hash_shake256x4.o thash_shake256_simplex4.o KECCAK4XDIR=../../../common/keccak4x KECCAK4XOBJ=KeccakP-1600-times4-SIMD256.o 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 a25bd357..29af90d1 100644 --- a/crypto_sign/sphincs-shake256-192f-simple/avx2/Makefile.Microsoft_nmake +++ b/crypto_sign/sphincs-shake256-192f-simple/avx2/Makefile.Microsoft_nmake @@ -2,7 +2,7 @@ # nmake /f Makefile.Microsoft_nmake LIBRARY=libsphincs-shake256-192f-simple_avx2.lib -OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_simple.obj hash_shake256x4.obj thash_shake256_simplex4.obj +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 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX diff --git a/crypto_sign/sphincs-shake256-192s-robust/avx2/Makefile b/crypto_sign/sphincs-shake256-192s-robust/avx2/Makefile index d375dc76..12ce9462 100644 --- a/crypto_sign/sphincs-shake256-192s-robust/avx2/Makefile +++ b/crypto_sign/sphincs-shake256-192s-robust/avx2/Makefile @@ -3,7 +3,7 @@ LIB=libsphincs-shake256-192s-robust_avx2.a HEADERS = params.h address.h wots.h utils.h utilsx4.h fips202x4.h fors.h api.h hash.h hashx4.h hash_state.h thash.h thashx4.h -OBJECTS = address.o wots.o utils.o utilsx4.o fips202x4.o fors.o hash_shake256x4.o sign.o hash_shake256.o thash_shake256_robust.o hash_shake256x4.o thash_shake256_robustx4.o +OBJECTS = address.o wots.o utils.o utilsx4.o fips202x4.o fors.o sign.o hash_shake256.o thash_shake256_robust.o hash_shake256x4.o thash_shake256_robustx4.o KECCAK4XDIR=../../../common/keccak4x KECCAK4XOBJ=KeccakP-1600-times4-SIMD256.o 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 8b914c5a..2b12f0f2 100644 --- a/crypto_sign/sphincs-shake256-192s-robust/avx2/Makefile.Microsoft_nmake +++ b/crypto_sign/sphincs-shake256-192s-robust/avx2/Makefile.Microsoft_nmake @@ -2,7 +2,7 @@ # nmake /f Makefile.Microsoft_nmake LIBRARY=libsphincs-shake256-192s-robust_avx2.lib -OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_robust.obj hash_shake256x4.obj thash_shake256_robustx4.obj +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 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX diff --git a/crypto_sign/sphincs-shake256-192s-simple/avx2/Makefile b/crypto_sign/sphincs-shake256-192s-simple/avx2/Makefile index f32555e1..7385d866 100644 --- a/crypto_sign/sphincs-shake256-192s-simple/avx2/Makefile +++ b/crypto_sign/sphincs-shake256-192s-simple/avx2/Makefile @@ -3,7 +3,7 @@ LIB=libsphincs-shake256-192s-simple_avx2.a HEADERS = params.h address.h wots.h utils.h utilsx4.h fips202x4.h fors.h api.h hash.h hashx4.h hash_state.h thash.h thashx4.h -OBJECTS = address.o wots.o utils.o utilsx4.o fips202x4.o fors.o hash_shake256x4.o sign.o hash_shake256.o thash_shake256_simple.o hash_shake256x4.o thash_shake256_simplex4.o +OBJECTS = address.o wots.o utils.o utilsx4.o fips202x4.o fors.o sign.o hash_shake256.o thash_shake256_simple.o hash_shake256x4.o thash_shake256_simplex4.o KECCAK4XDIR=../../../common/keccak4x KECCAK4XOBJ=KeccakP-1600-times4-SIMD256.o 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 4f3582f8..8d3c621b 100644 --- a/crypto_sign/sphincs-shake256-192s-simple/avx2/Makefile.Microsoft_nmake +++ b/crypto_sign/sphincs-shake256-192s-simple/avx2/Makefile.Microsoft_nmake @@ -2,7 +2,7 @@ # nmake /f Makefile.Microsoft_nmake LIBRARY=libsphincs-shake256-192s-simple_avx2.lib -OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_simple.obj hash_shake256x4.obj thash_shake256_simplex4.obj +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 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX diff --git a/crypto_sign/sphincs-shake256-256f-robust/avx2/Makefile b/crypto_sign/sphincs-shake256-256f-robust/avx2/Makefile index 8f45578a..1918b7ac 100644 --- a/crypto_sign/sphincs-shake256-256f-robust/avx2/Makefile +++ b/crypto_sign/sphincs-shake256-256f-robust/avx2/Makefile @@ -3,7 +3,7 @@ LIB=libsphincs-shake256-256f-robust_avx2.a HEADERS = params.h address.h wots.h utils.h utilsx4.h fips202x4.h fors.h api.h hash.h hashx4.h hash_state.h thash.h thashx4.h -OBJECTS = address.o wots.o utils.o utilsx4.o fips202x4.o fors.o hash_shake256x4.o sign.o hash_shake256.o thash_shake256_robust.o hash_shake256x4.o thash_shake256_robustx4.o +OBJECTS = address.o wots.o utils.o utilsx4.o fips202x4.o fors.o sign.o hash_shake256.o thash_shake256_robust.o hash_shake256x4.o thash_shake256_robustx4.o KECCAK4XDIR=../../../common/keccak4x KECCAK4XOBJ=KeccakP-1600-times4-SIMD256.o 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 915de214..a8e77844 100644 --- a/crypto_sign/sphincs-shake256-256f-robust/avx2/Makefile.Microsoft_nmake +++ b/crypto_sign/sphincs-shake256-256f-robust/avx2/Makefile.Microsoft_nmake @@ -2,7 +2,7 @@ # nmake /f Makefile.Microsoft_nmake LIBRARY=libsphincs-shake256-256f-robust_avx2.lib -OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_robust.obj hash_shake256x4.obj thash_shake256_robustx4.obj +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 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX diff --git a/crypto_sign/sphincs-shake256-256f-simple/avx2/Makefile b/crypto_sign/sphincs-shake256-256f-simple/avx2/Makefile index 9a83d9e4..d52dd345 100644 --- a/crypto_sign/sphincs-shake256-256f-simple/avx2/Makefile +++ b/crypto_sign/sphincs-shake256-256f-simple/avx2/Makefile @@ -3,7 +3,7 @@ LIB=libsphincs-shake256-256f-simple_avx2.a HEADERS = params.h address.h wots.h utils.h utilsx4.h fips202x4.h fors.h api.h hash.h hashx4.h hash_state.h thash.h thashx4.h -OBJECTS = address.o wots.o utils.o utilsx4.o fips202x4.o fors.o hash_shake256x4.o sign.o hash_shake256.o thash_shake256_simple.o hash_shake256x4.o thash_shake256_simplex4.o +OBJECTS = address.o wots.o utils.o utilsx4.o fips202x4.o fors.o sign.o hash_shake256.o thash_shake256_simple.o hash_shake256x4.o thash_shake256_simplex4.o KECCAK4XDIR=../../../common/keccak4x KECCAK4XOBJ=KeccakP-1600-times4-SIMD256.o 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 8f2b8cbc..2685fc5c 100644 --- a/crypto_sign/sphincs-shake256-256f-simple/avx2/Makefile.Microsoft_nmake +++ b/crypto_sign/sphincs-shake256-256f-simple/avx2/Makefile.Microsoft_nmake @@ -2,7 +2,7 @@ # nmake /f Makefile.Microsoft_nmake LIBRARY=libsphincs-shake256-256f-simple_avx2.lib -OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_simple.obj hash_shake256x4.obj thash_shake256_simplex4.obj +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 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX diff --git a/crypto_sign/sphincs-shake256-256s-robust/avx2/Makefile b/crypto_sign/sphincs-shake256-256s-robust/avx2/Makefile index 0142ba92..d831fede 100644 --- a/crypto_sign/sphincs-shake256-256s-robust/avx2/Makefile +++ b/crypto_sign/sphincs-shake256-256s-robust/avx2/Makefile @@ -3,7 +3,7 @@ LIB=libsphincs-shake256-256s-robust_avx2.a HEADERS = params.h address.h wots.h utils.h utilsx4.h fips202x4.h fors.h api.h hash.h hashx4.h hash_state.h thash.h thashx4.h -OBJECTS = address.o wots.o utils.o utilsx4.o fips202x4.o fors.o hash_shake256x4.o sign.o hash_shake256.o thash_shake256_robust.o hash_shake256x4.o thash_shake256_robustx4.o +OBJECTS = address.o wots.o utils.o utilsx4.o fips202x4.o fors.o sign.o hash_shake256.o thash_shake256_robust.o hash_shake256x4.o thash_shake256_robustx4.o KECCAK4XDIR=../../../common/keccak4x KECCAK4XOBJ=KeccakP-1600-times4-SIMD256.o 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 845963bb..817778e2 100644 --- a/crypto_sign/sphincs-shake256-256s-robust/avx2/Makefile.Microsoft_nmake +++ b/crypto_sign/sphincs-shake256-256s-robust/avx2/Makefile.Microsoft_nmake @@ -2,7 +2,7 @@ # nmake /f Makefile.Microsoft_nmake LIBRARY=libsphincs-shake256-256s-robust_avx2.lib -OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_robust.obj hash_shake256x4.obj thash_shake256_robustx4.obj +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 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX diff --git a/crypto_sign/sphincs-shake256-256s-simple/avx2/Makefile b/crypto_sign/sphincs-shake256-256s-simple/avx2/Makefile index 277e30f6..348c788c 100644 --- a/crypto_sign/sphincs-shake256-256s-simple/avx2/Makefile +++ b/crypto_sign/sphincs-shake256-256s-simple/avx2/Makefile @@ -3,7 +3,7 @@ LIB=libsphincs-shake256-256s-simple_avx2.a HEADERS = params.h address.h wots.h utils.h utilsx4.h fips202x4.h fors.h api.h hash.h hashx4.h hash_state.h thash.h thashx4.h -OBJECTS = address.o wots.o utils.o utilsx4.o fips202x4.o fors.o hash_shake256x4.o sign.o hash_shake256.o thash_shake256_simple.o hash_shake256x4.o thash_shake256_simplex4.o +OBJECTS = address.o wots.o utils.o utilsx4.o fips202x4.o fors.o sign.o hash_shake256.o thash_shake256_simple.o hash_shake256x4.o thash_shake256_simplex4.o KECCAK4XDIR=../../../common/keccak4x KECCAK4XOBJ=KeccakP-1600-times4-SIMD256.o 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 f804b8f2..febec07b 100644 --- a/crypto_sign/sphincs-shake256-256s-simple/avx2/Makefile.Microsoft_nmake +++ b/crypto_sign/sphincs-shake256-256s-simple/avx2/Makefile.Microsoft_nmake @@ -2,7 +2,7 @@ # nmake /f Makefile.Microsoft_nmake LIBRARY=libsphincs-shake256-256s-simple_avx2.lib -OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_simple.obj hash_shake256x4.obj thash_shake256_simplex4.obj +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 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX