From 2f20776d2e77315fb60d13f95c09626322b549e8 Mon Sep 17 00:00:00 2001 From: Thom Wiggers Date: Fri, 29 May 2020 10:13:20 +0200 Subject: [PATCH] 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