rm fips202x2 in Dilithium

James-E-A · Feb 7, 2024 · 7bbdebe · 7bbdebe
1 parent 05df469
commit 7bbdebe
Show file tree

Hide file tree

Showing 41 changed files with 46 additions and 2,840 deletions.
diff --git a/crypto_kem/kyber1024/aarch64/Makefile b/crypto_kem/kyber1024/aarch64/Makefile
@@ -24,7 +24,6 @@ $(LIB): $(OBJECTS) $(KECCAK2X)
 $(KECCAK2X):
 	$(MAKE) -C $(KECCAK2XDIR) CFLAGS="$(CFLAGS)" $(KECCAK2XOBJ)
 
-
 clean:
 	$(RM) $(OBJECTS)
 	$(RM) $(LIB)
diff --git a/crypto_kem/kyber768/aarch64/Makefile b/crypto_kem/kyber768/aarch64/Makefile
@@ -24,7 +24,6 @@ $(LIB): $(OBJECTS) $(KECCAK2X)
 $(KECCAK2X):
 	$(MAKE) -C $(KECCAK2XDIR) CFLAGS="$(CFLAGS)" $(KECCAK2XOBJ)
 
-
 clean:
 	$(RM) $(OBJECTS)
 	$(RM) $(LIB)
diff --git a/crypto_sign/dilithium2/aarch64/Makefile b/crypto_sign/dilithium2/aarch64/Makefile
@@ -4,8 +4,11 @@ LIB=libdilithium2_aarch64.a
 HEADERS=api.h macros_common.inc macros.inc NTT_params.h ntt.h packing.h params.h poly.h polyvec.h reduce.h rounding.h sign.h symmetric.h
 OBJECTS= ntt.o packing.o poly.o polyvec.o reduce.o rounding.o sign.o symmetric-shake.o __asm_iNTT.o __asm_NTT.o __asm_poly.o
 
+CFLAGS=-O3 -Wall -Wextra -Wpedantic -Werror -Wmissing-prototypes -Wredundant-decls -std=c99 -I../../../common $(EXTRAFLAGS)
 
-CFLAGS=-O3 -Wall -Wextra -Wpedantic -Werror -Wmissing-prototypes -Wredundant-decls -std=c99 -I../../../common $(EXTRAFLAGS) -g
+KECCAK2XDIR=../../../common/keccak2x
+KECCAK2XOBJ=fips202x2.o feat.o
+KECCAK2X=$(addprefix $(KECCAK2XDIR)/,$(KECCAK2XOBJ))
 
 all: $(LIB)
 
@@ -15,9 +18,14 @@ all: $(LIB)
 %.o: %.S $(HEADERS)
 	$(CC) $(CFLAGS) -c -o $@ $<
 
-$(LIB): $(OBJECTS) $(HEADERS)
-	$(AR) -r $@ $(OBJECTS)
+$(LIB): $(OBJECTS) $(KECCAK2X)
+	$(AR) -r $@ $(OBJECTS) $(KECCAK2X)
+
+$(KECCAK2X):
+	$(MAKE) -C $(KECCAK2XDIR) CFLAGS="$(CFLAGS)" $(KECCAK2XOBJ)
 
 clean:
 	$(RM) $(OBJECTS)
 	$(RM) $(LIB)
+
+
diff --git a/crypto_sign/dilithium2/aarch64/feat.S b/crypto_sign/dilithium2/aarch64/feat.S