From 5f2c32294564f23505443cfd62d34fa69454da49 Mon Sep 17 00:00:00 2001 From: Thom Wiggers Date: Thu, 21 May 2020 18:51:50 +0200 Subject: [PATCH 1/6] Add missing obj file to Windows SPHINCS+ AVX2 builds --- .../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 +- .../sphincs-shake256-128f-robust/avx2/Makefile.Microsoft_nmake | 2 +- .../sphincs-shake256-128f-simple/avx2/Makefile.Microsoft_nmake | 2 +- .../sphincs-shake256-128s-robust/avx2/Makefile.Microsoft_nmake | 2 +- .../sphincs-shake256-128s-simple/avx2/Makefile.Microsoft_nmake | 2 +- .../sphincs-shake256-192f-robust/avx2/Makefile.Microsoft_nmake | 2 +- .../sphincs-shake256-192f-simple/avx2/Makefile.Microsoft_nmake | 2 +- .../sphincs-shake256-192s-robust/avx2/Makefile.Microsoft_nmake | 2 +- .../sphincs-shake256-192s-simple/avx2/Makefile.Microsoft_nmake | 2 +- .../sphincs-shake256-256f-robust/avx2/Makefile.Microsoft_nmake | 2 +- .../sphincs-shake256-256f-simple/avx2/Makefile.Microsoft_nmake | 2 +- .../sphincs-shake256-256s-robust/avx2/Makefile.Microsoft_nmake | 2 +- .../sphincs-shake256-256s-simple/avx2/Makefile.Microsoft_nmake | 2 +- 24 files changed, 24 insertions(+), 24 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 2205314a..77b9110e 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 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 fors.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 2a125335..7f3c4162 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 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 fors.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 f15f14c0..305ecd6b 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 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 fors.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 02181c3f..43f3ad65 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 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 fors.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 c290eefe..12466225 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 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 fors.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 891b3705..971e24d5 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 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 fors.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 0fe59edf..81c115c9 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 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 fors.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 1c91a096..3082da8c 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 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 fors.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 072f6e9b..27493261 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 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 fors.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 d75eb235..54a6ac1c 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 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 fors.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 4e0363da..ac557390 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 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 fors.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 c91abda8..5eb9853a 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 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 fors.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.Microsoft_nmake b/crypto_sign/sphincs-shake256-128f-robust/avx2/Makefile.Microsoft_nmake index 4988abda..829ac50b 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 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 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.Microsoft_nmake b/crypto_sign/sphincs-shake256-128f-simple/avx2/Makefile.Microsoft_nmake index bce12a97..7d67c9dd 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 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 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.Microsoft_nmake b/crypto_sign/sphincs-shake256-128s-robust/avx2/Makefile.Microsoft_nmake index 0496577b..5575777b 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 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 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.Microsoft_nmake b/crypto_sign/sphincs-shake256-128s-simple/avx2/Makefile.Microsoft_nmake index 67c225a1..88963d45 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 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 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.Microsoft_nmake b/crypto_sign/sphincs-shake256-192f-robust/avx2/Makefile.Microsoft_nmake index 5de7f6d6..304f8cd3 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 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 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.Microsoft_nmake b/crypto_sign/sphincs-shake256-192f-simple/avx2/Makefile.Microsoft_nmake index 732e8957..a25bd357 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 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 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.Microsoft_nmake b/crypto_sign/sphincs-shake256-192s-robust/avx2/Makefile.Microsoft_nmake index cb4d1dbb..8b914c5a 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 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 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.Microsoft_nmake b/crypto_sign/sphincs-shake256-192s-simple/avx2/Makefile.Microsoft_nmake index a4b344ac..4f3582f8 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 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 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.Microsoft_nmake b/crypto_sign/sphincs-shake256-256f-robust/avx2/Makefile.Microsoft_nmake index 2bde6536..915de214 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 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 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.Microsoft_nmake b/crypto_sign/sphincs-shake256-256f-simple/avx2/Makefile.Microsoft_nmake index 7327e626..8f2b8cbc 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 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 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.Microsoft_nmake b/crypto_sign/sphincs-shake256-256s-robust/avx2/Makefile.Microsoft_nmake index 3cdf1132..845963bb 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 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 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.Microsoft_nmake b/crypto_sign/sphincs-shake256-256s-simple/avx2/Makefile.Microsoft_nmake index e5113b44..f804b8f2 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 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 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 From 2f20776d2e77315fb60d13f95c09626322b549e8 Mon Sep 17 00:00:00 2001 From: Thom Wiggers Date: Fri, 29 May 2020 10:13:20 +0200 Subject: [PATCH 2/6] Fix haraka Makefile.Microsoft_nmake --- .../sphincs-haraka-128f-robust/aesni/Makefile.Microsoft_nmake | 2 +- .../sphincs-haraka-128f-simple/aesni/Makefile.Microsoft_nmake | 2 +- .../sphincs-haraka-128s-robust/aesni/Makefile.Microsoft_nmake | 2 +- .../sphincs-haraka-128s-simple/aesni/Makefile.Microsoft_nmake | 2 +- .../sphincs-haraka-192f-robust/aesni/Makefile.Microsoft_nmake | 2 +- .../sphincs-haraka-192f-simple/aesni/Makefile.Microsoft_nmake | 2 +- .../sphincs-haraka-192s-robust/aesni/Makefile.Microsoft_nmake | 2 +- .../sphincs-haraka-192s-simple/aesni/Makefile.Microsoft_nmake | 2 +- .../sphincs-haraka-256f-robust/aesni/Makefile.Microsoft_nmake | 2 +- .../sphincs-haraka-256f-simple/aesni/Makefile.Microsoft_nmake | 2 +- .../sphincs-haraka-256s-robust/aesni/Makefile.Microsoft_nmake | 2 +- .../sphincs-haraka-256s-simple/aesni/Makefile.Microsoft_nmake | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/crypto_sign/sphincs-haraka-128f-robust/aesni/Makefile.Microsoft_nmake b/crypto_sign/sphincs-haraka-128f-robust/aesni/Makefile.Microsoft_nmake index 2a1807f1..7b399d06 100644 --- a/crypto_sign/sphincs-haraka-128f-robust/aesni/Makefile.Microsoft_nmake +++ b/crypto_sign/sphincs-haraka-128f-robust/aesni/Makefile.Microsoft_nmake @@ -2,7 +2,7 @@ # nmake /f Makefile.Microsoft_nmake LIBRARY=libsphincs-haraka-128f-robust_aesni.lib -OBJECTS=address.obj wots.obj utils.obj fors.obj sign.obj hash_haraka.obj thash_haraka_robust.obj hash_harakax4.obj thash_haraka_robustx4.obj haraka.obj +OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fors.obj sign.obj hash_haraka.obj thash_haraka_robust.obj hash_harakax4.obj thash_haraka_robustx4.obj haraka.obj # We ignore warning C4127: in thash_haraka_*x4.c we use a conditional # that when the macro is generated for inblocks = 1 results in a case diff --git a/crypto_sign/sphincs-haraka-128f-simple/aesni/Makefile.Microsoft_nmake b/crypto_sign/sphincs-haraka-128f-simple/aesni/Makefile.Microsoft_nmake index 0170c82a..003266e5 100644 --- a/crypto_sign/sphincs-haraka-128f-simple/aesni/Makefile.Microsoft_nmake +++ b/crypto_sign/sphincs-haraka-128f-simple/aesni/Makefile.Microsoft_nmake @@ -2,7 +2,7 @@ # nmake /f Makefile.Microsoft_nmake LIBRARY=libsphincs-haraka-128f-simple_aesni.lib -OBJECTS=address.obj wots.obj utils.obj fors.obj sign.obj hash_haraka.obj thash_haraka_simple.obj hash_harakax4.obj thash_haraka_simplex4.obj haraka.obj +OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fors.obj sign.obj hash_haraka.obj thash_haraka_simple.obj hash_harakax4.obj thash_haraka_simplex4.obj haraka.obj # We ignore warning C4127: in thash_haraka_*x4.c we use a conditional # that when the macro is generated for inblocks = 1 results in a case diff --git a/crypto_sign/sphincs-haraka-128s-robust/aesni/Makefile.Microsoft_nmake b/crypto_sign/sphincs-haraka-128s-robust/aesni/Makefile.Microsoft_nmake index cbac2cf2..2b773628 100644 --- a/crypto_sign/sphincs-haraka-128s-robust/aesni/Makefile.Microsoft_nmake +++ b/crypto_sign/sphincs-haraka-128s-robust/aesni/Makefile.Microsoft_nmake @@ -2,7 +2,7 @@ # nmake /f Makefile.Microsoft_nmake LIBRARY=libsphincs-haraka-128s-robust_aesni.lib -OBJECTS=address.obj wots.obj utils.obj fors.obj sign.obj hash_haraka.obj thash_haraka_robust.obj hash_harakax4.obj thash_haraka_robustx4.obj haraka.obj +OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fors.obj sign.obj hash_haraka.obj thash_haraka_robust.obj hash_harakax4.obj thash_haraka_robustx4.obj haraka.obj # We ignore warning C4127: in thash_haraka_*x4.c we use a conditional # that when the macro is generated for inblocks = 1 results in a case diff --git a/crypto_sign/sphincs-haraka-128s-simple/aesni/Makefile.Microsoft_nmake b/crypto_sign/sphincs-haraka-128s-simple/aesni/Makefile.Microsoft_nmake index d5259277..30c34481 100644 --- a/crypto_sign/sphincs-haraka-128s-simple/aesni/Makefile.Microsoft_nmake +++ b/crypto_sign/sphincs-haraka-128s-simple/aesni/Makefile.Microsoft_nmake @@ -2,7 +2,7 @@ # nmake /f Makefile.Microsoft_nmake LIBRARY=libsphincs-haraka-128s-simple_aesni.lib -OBJECTS=address.obj wots.obj utils.obj fors.obj sign.obj hash_haraka.obj thash_haraka_simple.obj hash_harakax4.obj thash_haraka_simplex4.obj haraka.obj +OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fors.obj sign.obj hash_haraka.obj thash_haraka_simple.obj hash_harakax4.obj thash_haraka_simplex4.obj haraka.obj # We ignore warning C4127: in thash_haraka_*x4.c we use a conditional # that when the macro is generated for inblocks = 1 results in a case diff --git a/crypto_sign/sphincs-haraka-192f-robust/aesni/Makefile.Microsoft_nmake b/crypto_sign/sphincs-haraka-192f-robust/aesni/Makefile.Microsoft_nmake index 5459fe6a..a346af35 100644 --- a/crypto_sign/sphincs-haraka-192f-robust/aesni/Makefile.Microsoft_nmake +++ b/crypto_sign/sphincs-haraka-192f-robust/aesni/Makefile.Microsoft_nmake @@ -2,7 +2,7 @@ # nmake /f Makefile.Microsoft_nmake LIBRARY=libsphincs-haraka-192f-robust_aesni.lib -OBJECTS=address.obj wots.obj utils.obj fors.obj sign.obj hash_haraka.obj thash_haraka_robust.obj hash_harakax4.obj thash_haraka_robustx4.obj haraka.obj +OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fors.obj sign.obj hash_haraka.obj thash_haraka_robust.obj hash_harakax4.obj thash_haraka_robustx4.obj haraka.obj # We ignore warning C4127: in thash_haraka_*x4.c we use a conditional # that when the macro is generated for inblocks = 1 results in a case diff --git a/crypto_sign/sphincs-haraka-192f-simple/aesni/Makefile.Microsoft_nmake b/crypto_sign/sphincs-haraka-192f-simple/aesni/Makefile.Microsoft_nmake index 696ec199..2b3d1d53 100644 --- a/crypto_sign/sphincs-haraka-192f-simple/aesni/Makefile.Microsoft_nmake +++ b/crypto_sign/sphincs-haraka-192f-simple/aesni/Makefile.Microsoft_nmake @@ -2,7 +2,7 @@ # nmake /f Makefile.Microsoft_nmake LIBRARY=libsphincs-haraka-192f-simple_aesni.lib -OBJECTS=address.obj wots.obj utils.obj fors.obj sign.obj hash_haraka.obj thash_haraka_simple.obj hash_harakax4.obj thash_haraka_simplex4.obj haraka.obj +OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fors.obj sign.obj hash_haraka.obj thash_haraka_simple.obj hash_harakax4.obj thash_haraka_simplex4.obj haraka.obj # We ignore warning C4127: in thash_haraka_*x4.c we use a conditional # that when the macro is generated for inblocks = 1 results in a case diff --git a/crypto_sign/sphincs-haraka-192s-robust/aesni/Makefile.Microsoft_nmake b/crypto_sign/sphincs-haraka-192s-robust/aesni/Makefile.Microsoft_nmake index 6cf8b9ee..bca7b867 100644 --- a/crypto_sign/sphincs-haraka-192s-robust/aesni/Makefile.Microsoft_nmake +++ b/crypto_sign/sphincs-haraka-192s-robust/aesni/Makefile.Microsoft_nmake @@ -2,7 +2,7 @@ # nmake /f Makefile.Microsoft_nmake LIBRARY=libsphincs-haraka-192s-robust_aesni.lib -OBJECTS=address.obj wots.obj utils.obj fors.obj sign.obj hash_haraka.obj thash_haraka_robust.obj hash_harakax4.obj thash_haraka_robustx4.obj haraka.obj +OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fors.obj sign.obj hash_haraka.obj thash_haraka_robust.obj hash_harakax4.obj thash_haraka_robustx4.obj haraka.obj # We ignore warning C4127: in thash_haraka_*x4.c we use a conditional # that when the macro is generated for inblocks = 1 results in a case diff --git a/crypto_sign/sphincs-haraka-192s-simple/aesni/Makefile.Microsoft_nmake b/crypto_sign/sphincs-haraka-192s-simple/aesni/Makefile.Microsoft_nmake index 8b4fdb50..81df8fd0 100644 --- a/crypto_sign/sphincs-haraka-192s-simple/aesni/Makefile.Microsoft_nmake +++ b/crypto_sign/sphincs-haraka-192s-simple/aesni/Makefile.Microsoft_nmake @@ -2,7 +2,7 @@ # nmake /f Makefile.Microsoft_nmake LIBRARY=libsphincs-haraka-192s-simple_aesni.lib -OBJECTS=address.obj wots.obj utils.obj fors.obj sign.obj hash_haraka.obj thash_haraka_simple.obj hash_harakax4.obj thash_haraka_simplex4.obj haraka.obj +OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fors.obj sign.obj hash_haraka.obj thash_haraka_simple.obj hash_harakax4.obj thash_haraka_simplex4.obj haraka.obj # We ignore warning C4127: in thash_haraka_*x4.c we use a conditional # that when the macro is generated for inblocks = 1 results in a case diff --git a/crypto_sign/sphincs-haraka-256f-robust/aesni/Makefile.Microsoft_nmake b/crypto_sign/sphincs-haraka-256f-robust/aesni/Makefile.Microsoft_nmake index 5860d365..3a9b3143 100644 --- a/crypto_sign/sphincs-haraka-256f-robust/aesni/Makefile.Microsoft_nmake +++ b/crypto_sign/sphincs-haraka-256f-robust/aesni/Makefile.Microsoft_nmake @@ -2,7 +2,7 @@ # nmake /f Makefile.Microsoft_nmake LIBRARY=libsphincs-haraka-256f-robust_aesni.lib -OBJECTS=address.obj wots.obj utils.obj fors.obj sign.obj hash_haraka.obj thash_haraka_robust.obj hash_harakax4.obj thash_haraka_robustx4.obj haraka.obj +OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fors.obj sign.obj hash_haraka.obj thash_haraka_robust.obj hash_harakax4.obj thash_haraka_robustx4.obj haraka.obj # We ignore warning C4127: in thash_haraka_*x4.c we use a conditional # that when the macro is generated for inblocks = 1 results in a case diff --git a/crypto_sign/sphincs-haraka-256f-simple/aesni/Makefile.Microsoft_nmake b/crypto_sign/sphincs-haraka-256f-simple/aesni/Makefile.Microsoft_nmake index b04f8650..6e33aa3a 100644 --- a/crypto_sign/sphincs-haraka-256f-simple/aesni/Makefile.Microsoft_nmake +++ b/crypto_sign/sphincs-haraka-256f-simple/aesni/Makefile.Microsoft_nmake @@ -2,7 +2,7 @@ # nmake /f Makefile.Microsoft_nmake LIBRARY=libsphincs-haraka-256f-simple_aesni.lib -OBJECTS=address.obj wots.obj utils.obj fors.obj sign.obj hash_haraka.obj thash_haraka_simple.obj hash_harakax4.obj thash_haraka_simplex4.obj haraka.obj +OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fors.obj sign.obj hash_haraka.obj thash_haraka_simple.obj hash_harakax4.obj thash_haraka_simplex4.obj haraka.obj # We ignore warning C4127: in thash_haraka_*x4.c we use a conditional # that when the macro is generated for inblocks = 1 results in a case diff --git a/crypto_sign/sphincs-haraka-256s-robust/aesni/Makefile.Microsoft_nmake b/crypto_sign/sphincs-haraka-256s-robust/aesni/Makefile.Microsoft_nmake index ae415116..0c7d36c6 100644 --- a/crypto_sign/sphincs-haraka-256s-robust/aesni/Makefile.Microsoft_nmake +++ b/crypto_sign/sphincs-haraka-256s-robust/aesni/Makefile.Microsoft_nmake @@ -2,7 +2,7 @@ # nmake /f Makefile.Microsoft_nmake LIBRARY=libsphincs-haraka-256s-robust_aesni.lib -OBJECTS=address.obj wots.obj utils.obj fors.obj sign.obj hash_haraka.obj thash_haraka_robust.obj hash_harakax4.obj thash_haraka_robustx4.obj haraka.obj +OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fors.obj sign.obj hash_haraka.obj thash_haraka_robust.obj hash_harakax4.obj thash_haraka_robustx4.obj haraka.obj # We ignore warning C4127: in thash_haraka_*x4.c we use a conditional # that when the macro is generated for inblocks = 1 results in a case diff --git a/crypto_sign/sphincs-haraka-256s-simple/aesni/Makefile.Microsoft_nmake b/crypto_sign/sphincs-haraka-256s-simple/aesni/Makefile.Microsoft_nmake index 1de59c52..365ff373 100644 --- a/crypto_sign/sphincs-haraka-256s-simple/aesni/Makefile.Microsoft_nmake +++ b/crypto_sign/sphincs-haraka-256s-simple/aesni/Makefile.Microsoft_nmake @@ -2,7 +2,7 @@ # nmake /f Makefile.Microsoft_nmake LIBRARY=libsphincs-haraka-256s-simple_aesni.lib -OBJECTS=address.obj wots.obj utils.obj fors.obj sign.obj hash_haraka.obj thash_haraka_simple.obj hash_harakax4.obj thash_haraka_simplex4.obj haraka.obj +OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fors.obj sign.obj hash_haraka.obj thash_haraka_simple.obj hash_harakax4.obj thash_haraka_simplex4.obj haraka.obj # We ignore warning C4127: in thash_haraka_*x4.c we use a conditional # that when the macro is generated for inblocks = 1 results in a case From 75037b5f133aef2745c85608ac75afa603fb9a66 Mon Sep 17 00:00:00 2001 From: Thom Wiggers Date: Fri, 29 May 2020 12:08:57 +0200 Subject: [PATCH 3/6] 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 From 1e8618affa6b72c76f2eb5cbc70b949aff734274 Mon Sep 17 00:00:00 2001 From: Thom Wiggers Date: Fri, 29 May 2020 12:13:17 +0200 Subject: [PATCH 4/6] Remove duplicate sha256x8 --- .../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 +- 12 files changed, 12 insertions(+), 12 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 b4424563..59cdd00d 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 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 +OBJECTS=address.obj wots.obj utils.obj utilsx8.obj sha256avx.obj sha256x8.obj fors.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 1192cf79..46808d05 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 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 +OBJECTS=address.obj wots.obj utils.obj utilsx8.obj sha256avx.obj sha256x8.obj fors.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 49cfd1c6..1669d5b7 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 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 +OBJECTS=address.obj wots.obj utils.obj utilsx8.obj sha256avx.obj sha256x8.obj fors.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 3202ecd6..ec4f2083 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 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 +OBJECTS=address.obj wots.obj utils.obj utilsx8.obj sha256avx.obj sha256x8.obj fors.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 4d95789e..21154fd4 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 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 +OBJECTS=address.obj wots.obj utils.obj utilsx8.obj sha256avx.obj sha256x8.obj fors.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 97d4df52..80415f2a 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 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 +OBJECTS=address.obj wots.obj utils.obj utilsx8.obj sha256avx.obj sha256x8.obj fors.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 252320df..13e3a3eb 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 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 +OBJECTS=address.obj wots.obj utils.obj utilsx8.obj sha256avx.obj sha256x8.obj fors.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 e75efc8b..c1fdc0fb 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 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 +OBJECTS=address.obj wots.obj utils.obj utilsx8.obj sha256avx.obj sha256x8.obj fors.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 82fc0a60..6054b4cf 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 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 +OBJECTS=address.obj wots.obj utils.obj utilsx8.obj sha256avx.obj sha256x8.obj fors.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 3065c3cf..769d1e94 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 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 +OBJECTS=address.obj wots.obj utils.obj utilsx8.obj sha256avx.obj sha256x8.obj fors.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 bf3fb02c..ac9c3743 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 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 +OBJECTS=address.obj wots.obj utils.obj utilsx8.obj sha256avx.obj sha256x8.obj fors.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 b8b2cbff..b276945c 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 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 +OBJECTS=address.obj wots.obj utils.obj utilsx8.obj sha256avx.obj sha256x8.obj fors.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 From adab5eb39a19e674787386a288dd70395440d057 Mon Sep 17 00:00:00 2001 From: Thom Wiggers Date: Fri, 29 May 2020 12:14:31 +0200 Subject: [PATCH 5/6] remove duplicate from Makefiles --- crypto_sign/sphincs-sha256-128f-robust/avx2/Makefile | 2 +- crypto_sign/sphincs-sha256-128f-simple/avx2/Makefile | 2 +- crypto_sign/sphincs-sha256-128s-robust/avx2/Makefile | 2 +- crypto_sign/sphincs-sha256-128s-simple/avx2/Makefile | 2 +- crypto_sign/sphincs-sha256-192f-robust/avx2/Makefile | 2 +- crypto_sign/sphincs-sha256-192f-simple/avx2/Makefile | 2 +- crypto_sign/sphincs-sha256-192s-robust/avx2/Makefile | 2 +- crypto_sign/sphincs-sha256-192s-simple/avx2/Makefile | 2 +- crypto_sign/sphincs-sha256-256f-robust/avx2/Makefile | 2 +- crypto_sign/sphincs-sha256-256f-simple/avx2/Makefile | 2 +- crypto_sign/sphincs-sha256-256s-robust/avx2/Makefile | 2 +- crypto_sign/sphincs-sha256-256s-simple/avx2/Makefile | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/crypto_sign/sphincs-sha256-128f-robust/avx2/Makefile b/crypto_sign/sphincs-sha256-128f-robust/avx2/Makefile index 3590aa5e..b17cb9b0 100644 --- a/crypto_sign/sphincs-sha256-128f-robust/avx2/Makefile +++ b/crypto_sign/sphincs-sha256-128f-robust/avx2/Makefile @@ -3,7 +3,7 @@ LIB=libsphincs-sha256-128f-robust_avx2.a HEADERS = params.h address.h wots.h utils.h utilsx8.h sha256avx.h sha256x8.h fors.h api.h hash.h hashx8.h hash_state.h thash.h thashx8.h sha256.h -OBJECTS = address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o hash_sha256x8.o sign.o hash_sha256.o thash_sha256_robust.o hash_sha256x8.o thash_sha256_robustx8.o sha256.o +OBJECTS = address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o sign.o hash_sha256.o thash_sha256_robust.o hash_sha256x8.o thash_sha256_robustx8.o sha256.o CFLAGS=-mavx2 -O3 -Wall -Wconversion -Wextra -Wpedantic -Wvla -Werror -Wmissing-prototypes -Wredundant-decls -std=c99 -I../../../common $(EXTRAFLAGS) diff --git a/crypto_sign/sphincs-sha256-128f-simple/avx2/Makefile b/crypto_sign/sphincs-sha256-128f-simple/avx2/Makefile index c49054c0..c1cc4973 100644 --- a/crypto_sign/sphincs-sha256-128f-simple/avx2/Makefile +++ b/crypto_sign/sphincs-sha256-128f-simple/avx2/Makefile @@ -3,7 +3,7 @@ LIB=libsphincs-sha256-128f-simple_avx2.a HEADERS = params.h address.h wots.h utils.h utilsx8.h sha256avx.h sha256x8.h fors.h api.h hash.h hashx8.h hash_state.h thash.h thashx8.h sha256.h -OBJECTS = address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o hash_sha256x8.o sign.o hash_sha256.o thash_sha256_simple.o hash_sha256x8.o thash_sha256_simplex8.o sha256.o +OBJECTS = address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o sign.o hash_sha256.o thash_sha256_simple.o hash_sha256x8.o thash_sha256_simplex8.o sha256.o CFLAGS=-mavx2 -O3 -Wall -Wconversion -Wextra -Wpedantic -Wvla -Werror -Wmissing-prototypes -Wredundant-decls -std=c99 -I../../../common $(EXTRAFLAGS) diff --git a/crypto_sign/sphincs-sha256-128s-robust/avx2/Makefile b/crypto_sign/sphincs-sha256-128s-robust/avx2/Makefile index 4bd1d4f8..dff43035 100644 --- a/crypto_sign/sphincs-sha256-128s-robust/avx2/Makefile +++ b/crypto_sign/sphincs-sha256-128s-robust/avx2/Makefile @@ -3,7 +3,7 @@ LIB=libsphincs-sha256-128s-robust_avx2.a HEADERS = params.h address.h wots.h utils.h utilsx8.h sha256avx.h sha256x8.h fors.h api.h hash.h hashx8.h hash_state.h thash.h thashx8.h sha256.h -OBJECTS = address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o hash_sha256x8.o sign.o hash_sha256.o thash_sha256_robust.o hash_sha256x8.o thash_sha256_robustx8.o sha256.o +OBJECTS = address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o sign.o hash_sha256.o thash_sha256_robust.o hash_sha256x8.o thash_sha256_robustx8.o sha256.o CFLAGS=-mavx2 -O3 -Wall -Wconversion -Wextra -Wpedantic -Wvla -Werror -Wmissing-prototypes -Wredundant-decls -std=c99 -I../../../common $(EXTRAFLAGS) diff --git a/crypto_sign/sphincs-sha256-128s-simple/avx2/Makefile b/crypto_sign/sphincs-sha256-128s-simple/avx2/Makefile index 7d91a2af..cf030ab5 100644 --- a/crypto_sign/sphincs-sha256-128s-simple/avx2/Makefile +++ b/crypto_sign/sphincs-sha256-128s-simple/avx2/Makefile @@ -3,7 +3,7 @@ LIB=libsphincs-sha256-128s-simple_avx2.a HEADERS = params.h address.h wots.h utils.h utilsx8.h sha256avx.h sha256x8.h fors.h api.h hash.h hashx8.h hash_state.h thash.h thashx8.h sha256.h -OBJECTS = address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o hash_sha256x8.o sign.o hash_sha256.o thash_sha256_simple.o hash_sha256x8.o thash_sha256_simplex8.o sha256.o +OBJECTS = address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o sign.o hash_sha256.o thash_sha256_simple.o hash_sha256x8.o thash_sha256_simplex8.o sha256.o CFLAGS=-mavx2 -O3 -Wall -Wconversion -Wextra -Wpedantic -Wvla -Werror -Wmissing-prototypes -Wredundant-decls -std=c99 -I../../../common $(EXTRAFLAGS) diff --git a/crypto_sign/sphincs-sha256-192f-robust/avx2/Makefile b/crypto_sign/sphincs-sha256-192f-robust/avx2/Makefile index 76ab47a6..f4022e14 100644 --- a/crypto_sign/sphincs-sha256-192f-robust/avx2/Makefile +++ b/crypto_sign/sphincs-sha256-192f-robust/avx2/Makefile @@ -3,7 +3,7 @@ LIB=libsphincs-sha256-192f-robust_avx2.a HEADERS = params.h address.h wots.h utils.h utilsx8.h sha256avx.h sha256x8.h fors.h api.h hash.h hashx8.h hash_state.h thash.h thashx8.h sha256.h -OBJECTS = address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o hash_sha256x8.o sign.o hash_sha256.o thash_sha256_robust.o hash_sha256x8.o thash_sha256_robustx8.o sha256.o +OBJECTS = address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o sign.o hash_sha256.o thash_sha256_robust.o hash_sha256x8.o thash_sha256_robustx8.o sha256.o CFLAGS=-mavx2 -O3 -Wall -Wconversion -Wextra -Wpedantic -Wvla -Werror -Wmissing-prototypes -Wredundant-decls -std=c99 -I../../../common $(EXTRAFLAGS) diff --git a/crypto_sign/sphincs-sha256-192f-simple/avx2/Makefile b/crypto_sign/sphincs-sha256-192f-simple/avx2/Makefile index f309eb6b..4a7240ac 100644 --- a/crypto_sign/sphincs-sha256-192f-simple/avx2/Makefile +++ b/crypto_sign/sphincs-sha256-192f-simple/avx2/Makefile @@ -3,7 +3,7 @@ LIB=libsphincs-sha256-192f-simple_avx2.a HEADERS = params.h address.h wots.h utils.h utilsx8.h sha256avx.h sha256x8.h fors.h api.h hash.h hashx8.h hash_state.h thash.h thashx8.h sha256.h -OBJECTS = address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o hash_sha256x8.o sign.o hash_sha256.o thash_sha256_simple.o hash_sha256x8.o thash_sha256_simplex8.o sha256.o +OBJECTS = address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o sign.o hash_sha256.o thash_sha256_simple.o hash_sha256x8.o thash_sha256_simplex8.o sha256.o CFLAGS=-mavx2 -O3 -Wall -Wconversion -Wextra -Wpedantic -Wvla -Werror -Wmissing-prototypes -Wredundant-decls -std=c99 -I../../../common $(EXTRAFLAGS) diff --git a/crypto_sign/sphincs-sha256-192s-robust/avx2/Makefile b/crypto_sign/sphincs-sha256-192s-robust/avx2/Makefile index 554905e8..db8b9e05 100644 --- a/crypto_sign/sphincs-sha256-192s-robust/avx2/Makefile +++ b/crypto_sign/sphincs-sha256-192s-robust/avx2/Makefile @@ -3,7 +3,7 @@ LIB=libsphincs-sha256-192s-robust_avx2.a HEADERS = params.h address.h wots.h utils.h utilsx8.h sha256avx.h sha256x8.h fors.h api.h hash.h hashx8.h hash_state.h thash.h thashx8.h sha256.h -OBJECTS = address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o hash_sha256x8.o sign.o hash_sha256.o thash_sha256_robust.o hash_sha256x8.o thash_sha256_robustx8.o sha256.o +OBJECTS = address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o sign.o hash_sha256.o thash_sha256_robust.o hash_sha256x8.o thash_sha256_robustx8.o sha256.o CFLAGS=-mavx2 -O3 -Wall -Wconversion -Wextra -Wpedantic -Wvla -Werror -Wmissing-prototypes -Wredundant-decls -std=c99 -I../../../common $(EXTRAFLAGS) diff --git a/crypto_sign/sphincs-sha256-192s-simple/avx2/Makefile b/crypto_sign/sphincs-sha256-192s-simple/avx2/Makefile index c9ba4b65..bafa06bc 100644 --- a/crypto_sign/sphincs-sha256-192s-simple/avx2/Makefile +++ b/crypto_sign/sphincs-sha256-192s-simple/avx2/Makefile @@ -3,7 +3,7 @@ LIB=libsphincs-sha256-192s-simple_avx2.a HEADERS = params.h address.h wots.h utils.h utilsx8.h sha256avx.h sha256x8.h fors.h api.h hash.h hashx8.h hash_state.h thash.h thashx8.h sha256.h -OBJECTS = address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o hash_sha256x8.o sign.o hash_sha256.o thash_sha256_simple.o hash_sha256x8.o thash_sha256_simplex8.o sha256.o +OBJECTS = address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o sign.o hash_sha256.o thash_sha256_simple.o hash_sha256x8.o thash_sha256_simplex8.o sha256.o CFLAGS=-mavx2 -O3 -Wall -Wconversion -Wextra -Wpedantic -Wvla -Werror -Wmissing-prototypes -Wredundant-decls -std=c99 -I../../../common $(EXTRAFLAGS) diff --git a/crypto_sign/sphincs-sha256-256f-robust/avx2/Makefile b/crypto_sign/sphincs-sha256-256f-robust/avx2/Makefile index 7e288be7..8c40f89b 100644 --- a/crypto_sign/sphincs-sha256-256f-robust/avx2/Makefile +++ b/crypto_sign/sphincs-sha256-256f-robust/avx2/Makefile @@ -3,7 +3,7 @@ LIB=libsphincs-sha256-256f-robust_avx2.a HEADERS = params.h address.h wots.h utils.h utilsx8.h sha256avx.h sha256x8.h fors.h api.h hash.h hashx8.h hash_state.h thash.h thashx8.h sha256.h -OBJECTS = address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o hash_sha256x8.o sign.o hash_sha256.o thash_sha256_robust.o hash_sha256x8.o thash_sha256_robustx8.o sha256.o +OBJECTS = address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o sign.o hash_sha256.o thash_sha256_robust.o hash_sha256x8.o thash_sha256_robustx8.o sha256.o CFLAGS=-mavx2 -O3 -Wall -Wconversion -Wextra -Wpedantic -Wvla -Werror -Wmissing-prototypes -Wredundant-decls -std=c99 -I../../../common $(EXTRAFLAGS) diff --git a/crypto_sign/sphincs-sha256-256f-simple/avx2/Makefile b/crypto_sign/sphincs-sha256-256f-simple/avx2/Makefile index 2379ef36..2af8fa8f 100644 --- a/crypto_sign/sphincs-sha256-256f-simple/avx2/Makefile +++ b/crypto_sign/sphincs-sha256-256f-simple/avx2/Makefile @@ -3,7 +3,7 @@ LIB=libsphincs-sha256-256f-simple_avx2.a HEADERS = params.h address.h wots.h utils.h utilsx8.h sha256avx.h sha256x8.h fors.h api.h hash.h hashx8.h hash_state.h thash.h thashx8.h sha256.h -OBJECTS = address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o hash_sha256x8.o sign.o hash_sha256.o thash_sha256_simple.o hash_sha256x8.o thash_sha256_simplex8.o sha256.o +OBJECTS = address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o sign.o hash_sha256.o thash_sha256_simple.o hash_sha256x8.o thash_sha256_simplex8.o sha256.o CFLAGS=-mavx2 -O3 -Wall -Wconversion -Wextra -Wpedantic -Wvla -Werror -Wmissing-prototypes -Wredundant-decls -std=c99 -I../../../common $(EXTRAFLAGS) diff --git a/crypto_sign/sphincs-sha256-256s-robust/avx2/Makefile b/crypto_sign/sphincs-sha256-256s-robust/avx2/Makefile index 62d536f1..069584ab 100644 --- a/crypto_sign/sphincs-sha256-256s-robust/avx2/Makefile +++ b/crypto_sign/sphincs-sha256-256s-robust/avx2/Makefile @@ -3,7 +3,7 @@ LIB=libsphincs-sha256-256s-robust_avx2.a HEADERS = params.h address.h wots.h utils.h utilsx8.h sha256avx.h sha256x8.h fors.h api.h hash.h hashx8.h hash_state.h thash.h thashx8.h sha256.h -OBJECTS = address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o hash_sha256x8.o sign.o hash_sha256.o thash_sha256_robust.o hash_sha256x8.o thash_sha256_robustx8.o sha256.o +OBJECTS = address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o sign.o hash_sha256.o thash_sha256_robust.o hash_sha256x8.o thash_sha256_robustx8.o sha256.o CFLAGS=-mavx2 -O3 -Wall -Wconversion -Wextra -Wpedantic -Wvla -Werror -Wmissing-prototypes -Wredundant-decls -std=c99 -I../../../common $(EXTRAFLAGS) diff --git a/crypto_sign/sphincs-sha256-256s-simple/avx2/Makefile b/crypto_sign/sphincs-sha256-256s-simple/avx2/Makefile index 74763e38..e599bf29 100644 --- a/crypto_sign/sphincs-sha256-256s-simple/avx2/Makefile +++ b/crypto_sign/sphincs-sha256-256s-simple/avx2/Makefile @@ -3,7 +3,7 @@ LIB=libsphincs-sha256-256s-simple_avx2.a HEADERS = params.h address.h wots.h utils.h utilsx8.h sha256avx.h sha256x8.h fors.h api.h hash.h hashx8.h hash_state.h thash.h thashx8.h sha256.h -OBJECTS = address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o hash_sha256x8.o sign.o hash_sha256.o thash_sha256_simple.o hash_sha256x8.o thash_sha256_simplex8.o sha256.o +OBJECTS = address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o sign.o hash_sha256.o thash_sha256_simple.o hash_sha256x8.o thash_sha256_simplex8.o sha256.o CFLAGS=-mavx2 -O3 -Wall -Wconversion -Wextra -Wpedantic -Wvla -Werror -Wmissing-prototypes -Wredundant-decls -std=c99 -I../../../common $(EXTRAFLAGS) From 5a89c9290066f367302b129e1f1d7e0cc92c2b9c Mon Sep 17 00:00:00 2001 From: Thom Wiggers Date: Fri, 29 May 2020 12:22:10 +0200 Subject: [PATCH 6/6] 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)