X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=Makefile_main.inc;h=a2e478641d5d57573b06804f66f4f84d326f15ee;hp=1edb6601f601c719bf59330314f0948a054de713;hb=d72d6fbe7abbd26958657c877bc0a3dbef8148ce;hpb=7715ef86b09869014eb5afd319e4acc2ce157b00

diff --git a/Makefile_main.inc b/Makefile_main.inc
index 1edb660..a2e4786 100644
--- a/Makefile_main.inc
+++ b/Makefile_main.inc
@@ -18,6 +18,7 @@
 
 BLOCK_CIPHERS  :=
 STREAM_CIPHERS :=
+AEAD_CIPHERS   :=
 HASHES         :=
 MACS           :=
 PRNGS          :=
@@ -39,8 +40,8 @@ include $(sort $(wildcard mkfiles/*.mk))
 default: info
 
 #-------------------------------------------------------------------------------
-ALGORITHMS = $(BLOCK_CIPHERS) $(STREAM_CIPHERS) $(HASHES) $(PRNGS) $(MACS) \
-			 $(ENCODINGS) $(SIGNATURE) $(PK_CIPHERS) $(AUX)
+ALGORITHMS = $(BLOCK_CIPHERS) $(STREAM_CIPHERS) $(AEAD_CIPHERS) $(HASHES) \
+              $(PRNGS) $(MACS) $(ENCODINGS) $(SIGNATURE) $(PK_CIPHERS) $(AUX)
 ALGORITHMS_OBJ = $(patsubst %,%_OBJ, $(ALGORITHMS))
 ALGORITHMS_TESTBIN = $(patsubst %,%_TESTBIN, $(ALGORITHMS))
 
@@ -68,19 +69,28 @@ define GenericTarget_Template
 $(1): $(2)
 endef
 
+ifeq ($(V),)
 define TargetSource_Template
 $(1): $(2)
 	@mkdir -p  $(dir $(1)) $(DEP_DIR)
 	@echo "[cc]: $(1) <-- $(2)"
 	@$(CC) $(CFLAGS_A) $(addprefix -I./,$(3)) $(addprefix -D, $(4)) -c -o $(1) $(2)
 endef
+else
+define TargetSource_Template
+$(1): $(2)
+	@mkdir -p  $(dir $(1)) $(DEP_DIR)
+	@echo "[cc]: $(1) <-- $(2)"
+	$(CC) $(CFLAGS_A) $(addprefix -I./,$(3)) $(addprefix -D, $(4)) -c -o $(1) $(2)
+endef
+endif
 
 
 
 define TargetSourceList_Template
 $(1): $(2)
 	@mkdir -p $(dir $(1)) $(DEP_DIR)
-	@echo "[cc]: $(1) <-- $(2)"
+	@echo "[lst]: $(1) <-- $(2)"
 	@$(CC) $(CFLAGS_A) $(addprefix -I./,$(3)) $(addprefix -D, $(4)) $(LIST_OPT) -c -o /dev/null $(2) > $(1)
 endef
 
@@ -191,7 +201,7 @@ endef
 
 $(foreach algo, $(ALGORITHMS), $(eval $(call TestBin_TEMPLATE, \
     $(algo), \
-    $(BIN_DIR)$(call lc, $(algo))/$(TEST_DIR)main-$(call lc, $(algo))-test.elf \
+    $(BIN_DIR)$(call lc, $(algo))/$(TEST_DIR)main-$(call lc, $(algo))-test.hex \
 )))
 
 #-------------------------------------------------------------------------------
@@ -210,6 +220,12 @@ $(foreach algo, $(ALGORITHMS), $(eval $(call Listing_TEMPLATE, \
 %.hex: %.elf
 	@echo "[objcopy]: $@"
 	@$(OBJCOPY) -j .text -j .data -O ihex $< $@
+ifdef HASH_TOOL
+ifneq ($(HASH_TOOL),)
+	@echo -n "[$(HASH_TOOL)]: "
+	@$(HASH_TOOL) $@
+endif
+endif
 
 #-------------------------------------------------------------------------------
 
@@ -355,6 +371,8 @@ info:
 	@echo "    $(BLOCK_CIPHERS)"
 	@echo "  stream ciphers:"
 	@echo "    $(STREAM_CIPHERS)"
+	@echo "  AEAD ciphers:"
+	@echo "    $(AEAD_CIPHERS)"
 	@echo "  hash functions:"
 	@echo "    $(HASHES)"
 	@echo "  MAC functions:"