1
1
mirror of https://github.com/henrydcase/pqc.git synced 2024-11-22 23:48:58 +00:00

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

This commit is contained in:
Peter Schwabe 2019-02-11 08:57:05 +01:00
commit 06b4279e0a
6 changed files with 39 additions and 8 deletions

View File

@ -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 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 OBJECTS=cbd.o indcpa.o kem.o kex.o ntt.o poly.o polyvec.o precomp.o reduce.o verify.o

View File

@ -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)

View File

@ -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)

View File

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

View File

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