X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=Makefile;h=97c56d5ae98b73c32b00c0ed79ad12928da5c314;hb=c9c11514d91b8c19f77d65ac051b998bd99048b0;hp=3b65518fce0d6ae61f016a8fea8e4a74caa9aa50;hpb=cb23251fd9f7c2d9e519a84b6975091bceb0fa66;p=avr-crypto-lib.git

diff --git a/Makefile b/Makefile
index 3b65518..97c56d5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,230 +1,302 @@
-# Makefile for the micro-crypt project
+# Makefile for the AVR-Crypto-Lib project
 # author: Daniel Otte
+SHELL = sh
 
-BLOCK_CIPHERS  := 
-STREAM_CIPHERS := 
+BLOCK_CIPHERS  :=
+STREAM_CIPHERS :=
 HASHES         :=
 MACS           :=
-PRNGS          := 
+PRNGS          :=
+ENCODINGS      :=
+SIGNATURE      :=
+PK_CIPHERS     :=
+AUX            :=
 
 # we use the gnu make standard library
 include gmsl
 include avr-makefile.inc
+
+#-------------------------------------------------------------------------------
+# inclusion of make stubs
 include mkfiles/*.mk
 
-ALGORITHMS = $(BLOCK_CIPHERS) $(STREAM_CIPHERS) $(HASHES) $(PRNGS) $(MACS)
+#-------------------------------------------------------------------------------
+ALGORITHMS = $(BLOCK_CIPHERS) $(STREAM_CIPHERS) $(HASHES) $(PRNGS) $(MACS) \
+			 $(ENCODINGS) $(SIGNATURE) $(PK_CIPHERS) $(AUX)
 ALGORITHMS_OBJ = $(patsubst %,%_OBJ, $(ALGORITHMS))
-define OBJinBINDIR_TEMPLATE
+ALGORITHMS_TEST_BIN = $(patsubst %,%_TEST_BIN, $(ALGORITHMS))
+
+#-------------------------------------------------------------------------------
+# define binary object in $(BIN_DIR)$(ALGO)/<obj>
+define Assert_Template
 $(1) = $(2)
 endef
-$(foreach a, $(ALGORITHMS_OBJ), $(eval $(call OBJinBINDIR_TEMPLATE, $(a), $(patsubst %.o,$(BIN_DIR)%.o,$($(a))))))
-ALGORITHMS_TEST_BIN = $(patsubst %,%_TEST_BIN, $(ALGORITHMS))
-$(foreach a, $(ALGORITHMS_TEST_BIN), $(eval $(call OBJinBINDIR_TEMPLATE, $(a), $(patsubst %.o,$(BIN_DIR)%.o,$($(a))))))
-#ALGORITHMS_TEST_BIN_MAIN = $(foreach a, $(ALGORITHMS_TEST_BIN), $(firstword $($(a))))
-#ALGORITHMS_TEST_BIN_MAIN_ELF = $(patsubst $(BIN_DIR)%.o, $(TESTBIN_DIR)%.elf, $(ALGORITHMS_TEST_BIN_MAIN))
-#ALGORITHMS_TEST_BIN_MAIN_HEX = $(patsubst $(BIN_DIR)%.o, $(TESTBIN_DIR)%.hex, $(ALGORITHMS_TEST_BIN_MAIN))
 
+$(foreach a, $(ALGORITHMS), $(eval $(call Assert_Template, \
+    $(a)_BINOBJ, \
+    $(addprefix $(BIN_DIR)$(call lc,$(a))/,$($(a)_OBJ)) \
+)))
+
+$(foreach a, $(ALGORITHMS), $(eval $(call Assert_Template, \
+    $(a)_TESTBINOBJ, \
+    $(addprefix $(BIN_DIR)$(call lc,$(a))/$(TEST_DIR),$($(a)_TEST_BIN)) \
+)))
+
+
+#$(foreach a, $(ALGORITHMS), \
+#    $(if $(def $(a)_DIR), \
+#    $(eval $(call Assert_Template, \
+#        $(a)_DIR, \
+#        . \
+#    ) \
+#    )) \
+#)
+#
+#$(foreach a, $(ALGORITHMS), \
+#    $(if $(call seq($(strip($($(a)_DIR))),)), \
+#    $(eval $(call Assert_Template, \
+#        $(a)_DIR, \
+#        . \
+#    ) \
+#    )) \
+#)
 
-ALGORITHMS_TEST_BIN_IMM =  $(foreach a, $(ALGORITHMS_TEST_BIN), $($(a)))
-ALGORITHMS_NESSIE_TEST = $(patsubst %,%_NESSIE_TEST, $(ALGORITHMS))
-ALGORITHMS_PERFORMANCE_TEST = $(patsubst %,%_PERORMANCE_TEST, $(ALGORITHMS))
+#-------------------------------------------------------------------------------
+#
+###	ifeq 'blafoo' ''
+###	    $(error no source ($(2)) for $(1) in TargetSource_Template)
+###	endif
+
+define TargetSource_Template
+$(1): $(2)
+	@echo "[cc]: $(1) <-- $(2)"
+	@mkdir -p $(dir $(1))
+	@$(CC) $(CFLAGS_A) -I./$(strip $(3)) -c -o $(1) $(2)
+endef
 
-ALGORITHMS_LC = $(call lc,$(ALGORITHMS))
+$(foreach a, $(ALGORITHMS), \
+  $(foreach b, $($(a)_OBJ), \
+    $(eval $(call TargetSource_Template, \
+      $(BIN_DIR)$(call lc, $(a))/$(b), \
+      $(filter %.S %.c, $(wildcard $($(a)_DIR)$(notdir $(patsubst %.o,%,$(b))).*)), \
+      $($(a)_DIR) \
+    )) \
+  ) \
+)
+
+$(foreach a, $(ALGORITHMS), \
+  $(foreach b, $($(a)_TEST_BIN), \
+    $(eval $(call TargetSource_Template, \
+	  $(BIN_DIR)$(call lc, $(a))/$(TEST_DIR)$(b), \
+      $(if $(call sne,$(strip $(filter %.S %.c, $(wildcard $(TESTSRC_DIR)$(notdir $(patsubst %.o,%,$(b))).*))),), \
+          $(filter %.S %.c, $(wildcard $(TESTSRC_DIR)$(notdir $(patsubst %.o,%,$(b))).*)), \
+          $(filter %.S %.c, $(wildcard ./$(notdir $(patsubst %.o,%,$(b))).*))\
+	  ), \
+      $($(a)_DIR) \
+    )) \
+  ) \
+)
+#-------------------------------------------------------------------------------
 
-ALGORITHMS_TEST_TARGET_ELF = $(patsubst %, $(TESTBIN_DIR)main-%-test.elf, $(ALGORITHMS_LC))
-ALGORITHMS_TEST_TARGET_HEX = $(patsubst %, $(TESTBIN_DIR)main-%-test.hex, $(ALGORITHMS_LC))
+define MainTestElf_Template
+$(1): $(2) $(3)
+	@echo "[ld]: $(1)"
+	@$(CC) $(CFLAGS_A) $(LDFLAGS)$(patsubst %.elf,%.map,$(1)) -o \
+	$(1) \
+	$(2) $(3) \
+	$(LIBS)
+endef
 
+$(foreach a, $(ALGORITHMS), \
+    $(eval $(call MainTestElf_Template,  \
+        $(BIN_DIR)$(call lc, $(a))/$(TEST_DIR)main-$(call lc, $(a))-test.elf, \
+        $($(a)_BINOBJ), \
+        $($(a)_TESTBINOBJ) \
+	)) \
+)
 
 #-------------------------------------------------------------------------------
 
-all: $(foreach algo, $(ALGORITHMS), $(algo)_OBJ)
+all: $(foreach algo, $(ALGORITHMS), $($(algo)_BINOBJ))
 
 #-------------------------------------------------------------------------------
 
-define BLA_TEMPLATE2
-$(2): $(3)
-	@echo "[gcc]: $$@"
-#	echo $$^
-	@$(CC) $(CFLAGS) $(LDFLAGS)$(patsubst %.elf,%.map,$(2)) -o \
-	$(2) \
-	$(3) \
-	$(LIBS)
+define TestBin_TEMPLATE
+$(1)_TEST_BIN: $(2)
 endef
 
-#$(foreach algo, $(ALGORITHMS), $(eval $(call BLA_TEMPLATE2, $(algo), $(patsubst $(BIN_DIR)%.o,$(TESTBIN_DIR)%.elf,$(firstword $($(algo)_TEST_BIN))), $(patsubst %.o,%.o,$($(algo)_TEST_BIN)) )))
-$(foreach algo, $(ALGORITHMS), $(eval $(call BLA_TEMPLATE2, $(algo), $(TESTBIN_DIR)main-$(call lc,$(algo))-test.elf, $(patsubst %.o,%.o,$($(algo)_TEST_BIN)) )))
+$(foreach algo, $(ALGORITHMS), $(eval $(call TestBin_TEMPLATE, \
+    $(algo), \
+    $(BIN_DIR)$(call lc, $(algo))/$(TEST_DIR)main-$(call lc, $(algo))-test.elf \
+)))
 
 #-------------------------------------------------------------------------------
-.PHONY: help
-help: info
 
-info:
-	@echo "infos on micro-crypt:"
-	@echo "  block ciphers:"
-	@echo "    $(BLOCK_CIPHERS)"
-	@echo "  stream ciphers:"
-	@echo "    $(STREAM_CIPHERS)"
-	@echo "  hash functions:"
-	@echo "    $(HASHES)"
-	@echo "  MAC functions:"
-	@echo "    $(MACS)"
-	@echo "  PRNG functions:"
-	@echo "    $(PRNGS)"
-	@echo "  ALGORITHMS_TEST_BIN:"
-	@echo "    $(ALGORITHMS_TEST_BIN)"
-	@echo "  ALGORITHMS_TEST_BIN_MAIN:"
-	@echo "    $(ALGORITHMS_TEST_BIN_MAIN)"
-	@echo "  ALGORITHMS_TEST_BIN_MAIN_ELF:"
-	@echo "    $(ALGORITHMS_TEST_BIN_MAIN_ELF)"
-	@echo "  ALGORITHMS_TEST_BIN_MAIN_HEX:"
-	@echo "    $(ALGORITHMS_TEST_BIN_MAIN_HEX)"
-	@echo "  ALGORITHMS_TEST_TARGET_ELF:"
-	@echo "    $(ALGORITHMS_TEST_TARGET_ELF)"
-	
-
-$(BIN_DIR)%.o: %.c
-	@echo "[gcc]:  $@"
-	@$(CC) $(CFLAGS)  -c -o $@ $<
-
-$(BIN_DIR)%.o: %.S
-	@echo "[as] :  $@"
-	@$(CC) $(ASFLAGS) -c -o $@ $<
-
-%.o: %.c
-	@echo "[gcc]:  $@"
-	@$(CC) $(CFLAGS)  -c -o $@ $<
-
-%.o: %.S
-	@echo "[as] :  $@"
-	@$(CC) $(ASFLAGS) -c -o $@ $<
+%.hex: %.elf
+	@echo "[objcopy]: $@"
+	@$(OBJCOPY) -j .text -j .data -O ihex $< $@
 
+#-------------------------------------------------------------------------------
 
-.PHONY: cores
-cores: $(ALGORITHMS_OBJ)
+define Flash_Template
+$(1)_FLASH: $(2)
+	@echo "[flash]: $(2)"
+	@$(FLASHCMD)$(call first,$(2))
+endef
 
-.PHONY: blockciphers
-blockciphers: $(patsubst %, %_OBJ, $(BLOCK_CIPHERS))
+$(foreach algo, $(ALGORITHMS), $(eval $(call Flash_Template, \
+    $(algo), \
+    $(BIN_DIR)$(call lc, $(algo))/$(TEST_DIR)main-$(call lc, $(algo))-test.hex \
+)))
+
+#-------------------------------------------------------------------------------
 
-.PHONY: streamciphers
-streamciphers: $(patsubst %, %_OBJ, $(STREAM_CIPHERS))
+define Speed_Template
+$(1)_SPEED:  $(1)_FLASH
+	@$(RUBY) $(SPEEDTOOL) -c $(SPEEDCMD) -t $(SPEEDLOG_DIR) -a $(call lc, $(1))
+endef
 
-.PHONY:  hashes
-hashes: $(patsubst %, %_OBJ, $(HASHES))
+$(foreach algo, $(ALGORITHMS), $(eval $(call Speed_Template, \
+    $(algo), $(algo) \
+)))
 
-.PHONY:  macs
-macs: $(patsubst %, %_OBJ, $(MACS))
+.PHONY: hash_speed
+hash_speed: $(foreach algo, $(HASHES), $(algo)_SPEED)
 
-.PHONY:  prngs
-prngs: $(patsubst %, %_OBJ, $(PRNGS))
+#-------------------------------------------------------------------------------
 
-tests: $(ALGORITHMS_TEST_BIN) \
-       $(ALGORITHMS_TEST_TARGET_ELF) \
-       $(ALGORITHMS_TEST_TARGET_HEX)
 
-.PHONY:  stats
-stats: $(SIZESTAT_FILE)
-	
-	
-$(SIZESTAT_FILE): $(patsubst %, %_size.txt, $(ALGORITHMS_LC))
-	$(RUBY) sumsize.rb $^ > $(SIZESTAT_FILE)
-	@cat $(SIZESTAT_FILE)	
-#-------------------------------------------------------------------------------	
-	
-define OBJ_TEMPLATE
-$(1)_OBJ: $(2)
-#	@echo " ALGO: $(1)"
-#	@echo " REQ:  $(2)"
+define Size_Template
+$(1)_SIZE:  $(2)
+	@echo "[size] $(1)"
+	$(SIZE) $(2) > $(strip $(SIZE_DIR))$(strip $(call lc, $(1))).size
 endef
 
-$(foreach algo, $(ALGORITHMS), $(eval $(call OBJ_TEMPLATE, $(algo), $($(algo)_OBJ))))
+$(foreach algo, $(ALGORITHMS), $(eval $(call Size_Template, \
+    $(strip $(algo)), $($(algo)_BINOBJ) \
+)))
 
-#-------------------------------------------------------------------------------
+.PHONY: hash_size
+hash_size: $(foreach algo, $(HASHES), $(algo)_SIZE)
 
-$(BLOCK_CIPHERS_OBJ): $(patsubst %,%_OBJ, $(BLOCK_CIPHERS)) 
-$(STREAM_CIPHERS_OBJ): $(patsubst %,%_OBJ, $(STREAM_CIPHERS))
-$(HASHES_OBJ): $(patsubst %,%_OBJ, $(HASHES))
-$(PRNGS_OBJ): $(patsubst %,%_OBJ, $(PRNGS))
-$(MACS_OBJ): $(patsubst %,%_OBJ, $(MACS))
+#-------------------------------------------------------------------------------
 
-$(ALGORITHMS_TEST_BIN): $(ALGORITHMS_TEST_BIN_IMM)
+.PHONY: tests
+tests: $(foreach a, $(ALGORITHMS), $(a)_TEST_BIN)
 
 #-------------------------------------------------------------------------------
 
-define SIZE_TEMPLATE
-$(1)_size.txt: $(2)
-	@echo "[size]: $(1)_size.txt"
-	@$(SIZE) $(2) > $(1)_size.txt
+define TestRun_Template
+$(1)_TESTRUN: $(1)_FLASH
+	@echo "[test]: $(1)"
+	$(RUBY) $(GET_TEST) $(TESTPORT) $(TESTPORTBAUDR) 8 1 nessie $(TESTLOG_DIR)$(TESTPREFIX) $(2)
 endef
 
-$(foreach algo, $(ALGORITHMS), $(eval $(call SIZE_TEMPLATE, $(call lc,$(algo)), $($(algo)_OBJ))))
+$(foreach algo, $(ALGORITHMS),$(eval $(call TestRun_Template, $(algo), $(call lc,$(algo)) )))
+
+all_testrun: $(foreach algo, $(ALGORITHMS), $(algo)_TESTRUN)
 
 #-------------------------------------------------------------------------------
 
-define FLASH_TEMPLATE
-$(1)_FLASH: $(2)
-	@echo "[flash]: $(2)"
-	@$(FLASHCMD)$(call first,$(2))
+define Obj_Template
+$(1)_OBJ: $(2)
 endef
 
-$(foreach algo, $(ALGORITHMS),$(eval $(call FLASH_TEMPLATE, $(algo), \
-                $(patsubst $(BIN_DIR)%.o,$(TESTBIN_DIR)%.hex,$(firstword $($(algo)_TEST_BIN)))) ))  
-
-#-------------------------------------------------------------------------------
+$(foreach algo, $(ALGORITHMS), \
+    $(eval $(call Obj_Template, \
+        $(algo), \
+        $($(algo)_BINOBJ)\
+	))\
+)
 
-.PHONY: clean
-clean:
-	rm -rf $(BIN_DIR)*.o *.o $(TESTBIN_DIR)*.elf $(TESTBIN_DIR)* *.elf *.eps *.png *.pdf *.bak *_size.txt
-	rm -rf *.lst *.map $(EXTRA_CLEAN_FILES) $(SIZESTAT_FILE)
-xclean: clean
-	rm -rf $(DEP_DIR)*.d
-
-flash:
-	$(ERASECMD)
-	$(FLASHCMD)
+.PHONY: cores
+cores: $(foreach algo, $(ALGORITHMS), $(algo)_OBJ)
 
-%.lst: %.elf
-	$(OBJDUMP) -h -S $< > $@
+.PHONY: blockchiphers
+blockciphers: $(foreach algo, $(BLOCK_CIPHERS), $(algo)_OBJ)
 
-# Rules for building the .text rom images
+.PHONY: streamchiphers
+streamciphers: $(foreach algo, $(STREAM_CIPHERS), $(algo)_OBJ)
 
-%.hex: %.elf
-	$(OBJCOPY) -j .text -j .data -O ihex $< $@
+.PHONY: hashes
+hashes: $(foreach algo, $(HASHES), $(algo)_OBJ)
 
-%.srec: %.elf
-	$(OBJCOPY) -j .text -j .data -O srec $< $@
+.PHONY: macs
+macs: $(foreach algo, $(MACS), $(algo)_OBJ)
 
-%.bin: %.elf
-	$(OBJCOPY) -j .text -j .data -O binary $< $@
+.PHONY: prngs
+prngs: $(foreach algo, $(PRNGS), $(algo)_OBJ)
 
-# Rules for building the .eeprom rom images
+.PHONY: encodings
+encodings: $(foreach algo, $(ENCODINGS), $(algo)_OBJ)
 
+.PHONY: aux
+aux: $(foreach algo, $(AUX), $(algo)_OBJ)
 
-%_eeprom.hex: %.elf
-	$(OBJCOPY) -j .eeprom --change-section-lma .eeprom=0 -O ihex $< $@
 
-%_eeprom.srec: %.elf
-	$(OBJCOPY) -j .eeprom --change-section-lma .eeprom=0 -O srec $< $@
+#-------------------------------------------------------------------------------
 
-%_eeprom.bin: %.elf
-	$(OBJCOPY) -j .eeprom --change-section-lma .eeprom=0 -O binary $< $@
-	
-	
-# Every thing below here is used by avr-libc's build system and can be ignored
-# by the casual user.
 
-FIG2DEV		 = fig2dev
-EXTRA_CLEAN_FILES       = *.hex *.bin *.srec
+.PHONY: help
+help: info
+.PHONY: info
+info:
+	@echo "infos on AVR-Crypto-lib:"
+	@echo "  block ciphers:"
+	@echo "    $(BLOCK_CIPHERS)"
+	@echo "  stream ciphers:"
+	@echo "    $(STREAM_CIPHERS)"
+	@echo "  hash functions:"
+	@echo "    $(HASHES)"
+	@echo "  MAC functions:"
+	@echo "    $(MACS)"
+	@echo "  PRNG functions:"
+	@echo "    $(PRNGS)"
+	@echo "  signature functions:"
+	@echo "    $(SIGNATURE)"
+	@echo "  public key ciphers:"
+	@echo "    $(PK_CIPHERS)"
+	@echo "  encodings:"
+	@echo "    $(ENCODINGS)"
+	@echo "  auxiliary functions:"
+	@echo "    $(AUX)"
+	@echo " targets:"
+	@echo "  all           - all algorithm cores"
+	@echo "  cores         - all algorithm cores"
+	@echo "  listings      - all algorithm core listings"
+	@echo "  tests         - all algorithm test programs"
+	@echo "  stats         - all algorithm size statistics"
+	@echo "  blockciphers  - all blockcipher cores"
+	@echo "  streamciphers - all streamcipher cores"
+	@echo "  hashes        - all hash cores"
+	@echo "  macs          - all MAC cores"
+	@echo "  prngs         - all PRNG cores"
+	@echo "  all_testrun   - testrun all algorithms"
+	@echo "  hash_size     - measure size of all hash functions"
+	@echo "  hash_speed    - measure performance of all hash functions"
+	@echo "  docu          - build doxygen documentation"
+	@echo "  clean         - remove a lot of builded files"
+	@echo "  depclean      - also remove dependency files"
+	@echo "  *_TEST_BIN    - build test program"
+	@echo "  *_TESTRUN     - run nessie test"
+	@echo "  *_OBJ         - build algorithm core"
+	@echo "  *_FLASH       - flash test program"
+	@echo "  *_LIST        - build assembler listing"
 
 
-%.eps: %.fig
-	$(FIG2DEV) -L eps $< $@
+#-------------------------------------------------------------------------------
 
-%.pdf: %.fig
-	$(FIG2DEV) -L pdf $< $@
+.PHONY: clean
+clean:
+	rm -rf $(BIN_DIR)*
 
-%.png: %.fig
-	$(FIG2DEV) -L png $< $@
+.PHONY: depclean
+depclean: clean
+	rm $(DEP_DIR)*.d
 
+#-------------------------------------------------------------------------------
+# dependency inclusion
+#
 
 DEPS := $(wildcard $(DEP_DIR)*.d)