Merge commit 'HEAD@{1}' (modified PR 17)

crypto_kem/kyber768/clean/Makefile

@@ -1,4 +1,4 @@
-# This Makefile has been tested with GNU Make and BSD Make
+# This Makefile can be used with GNU Make or BSD Make
 
 LIB=libkyber768_clean.a
 OBJECTS=cbd.o indcpa.o kem.o kex.o ntt.o poly.o polyvec.o precomp.o reduce.o verify.o

crypto_sign/dilithium-iii/clean/Makefile

@@ -0,0 +1,15 @@
+# This Makefile can be used with GNU Make or BSD Make
+
+LIB=libdilithium-iii_clean.a
+OBJECTS=ntt.o packing.o poly.o polyvec.o reduce.o rounding.o sign.o
+
+CFLAGS=-Wall -Wextra -Wpedantic -Werror -std=c99 -I../../../common $(EXTRAFLAGS)
+
+all: $(LIB)
+
+$(LIB): $(OBJECTS)
+	$(AR) -r $@ $(OBJECTS)
+
+clean:
+	$(RM) $(OBJECTS)
+	$(RM) $(LIB)

crypto_sign/dilithium-iii/clean/Makefile.Microsoft_nmake

@@ -0,0 +1,16 @@
+# This Makefile can be used with Microsoft Visual Studio's nmake using the command:
+#    nmake /f Makefile.Microsoft_nmake
+
+LIB=libdilithium-iii_clean.lib
+OBJECTS=ntt.obj packing.obj poly.obj polyvec.obj reduce.obj rounding.obj sign.obj
+
+CFLAGS=/I ..\..\..\common /W1 /WX # FIXME: ideally would use /W4 instead of /W1, but too many failures in Dilithium right now
+
+all: $(LIB)
+
+$(LIB): $(OBJECTS)
+	LIB.EXE /OUT:$@ $**
+
+clean:
+	DEL $(OBJECTS)
+	DEL $(LIB)

crypto_sign/dilithium-iii/clean/poly.h

@@ -7,7 +7,7 @@
 
 typedef struct {
     uint32_t coeffs[N];
-} poly __attribute__((aligned(32)));
+} poly;
 
 void PQCLEAN_DILITHIUMIII_poly_reduce(poly *a);
 void PQCLEAN_DILITHIUMIII_poly_csubq(poly *a);

scripts_windows/build_all.bat

@@ -5,7 +5,7 @@ SET EL=0
 REM CALL "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
 REM IF ERRORLEVEL 1 SET EL=1
 
-FOR /D %%K IN (crypto_kem\*) DO (
+FOR /D %%K IN (crypto_kem\* crypto_sign\*) DO (
   FOR /D %%L IN (%%K\*) DO (
     cd %%L
     nmake /f Makefile.Microsoft_nmake clean