added basic library creation support

diff --git a/Makefile b/Makefile
index b98015985816bb362960a3dd9768fe77d8ceef7f..6f2efd1a4b89ab051d37c8929b349d4afb9d77f9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # Makefile for the ARM-Crypto-Lib project
 #
-#    This file is part of the AVR-Crypto-Lib.
+#    This file is part of the ARM-Crypto-Lib.
 #    Copyright (C) 2010 Daniel Otte (daniel.otte@rub.de)
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -27,7 +27,7 @@ ENCODINGS      :=
 SIGNATURE      :=
 PK_CIPHERS     :=
 AUX            :=
-
+LIB_ALGOS      :=
 
 # we use the gnu make standard library
 include gmsl
@@ -40,18 +40,50 @@ GLOBAL_INCDIR := ./ $(TESTSRC_DIR)
 # inclusion of make stubs
 include mkfiles/*.mk
 
+define Assert_Template
+$(1) = $(2)
+endef
+
+define Add_Template
+$(1) += $(2)
+endef
+
 #-------------------------------------------------------------------------------
 ALGORITHMS = $(BLOCK_CIPHERS) $(STREAM_CIPHERS) $(HASHES) $(PRNGS) $(MACS) \
                         $(ENCODINGS) $(SIGNATURE) $(PK_CIPHERS) $(AUX)
 ALGORITHMS_OBJ = $(patsubst %,%_OBJ, $(ALGORITHMS))
-ALGORITHMS_TEST_BIN = $(patsubst %,%_TEST_BIN, $(ALGORITHMS))
+ALGORITHMS_TESTBIN = $(patsubst %,%_TESTBIN, $(ALGORITHMS))
+
+LIB_OBJECTS := 
+LIB_SRCDIRS := 
+LIB_DEFINES :=
+
+$(foreach a, $(LIB_ALGOS), $(eval $(call Add_Template, \
+  LIB_OBJECTS, \
+  $($(a)_OBJ)  \
+)))
+LIB_OBJECTS := $(addprefix $(BIN_DIR)$(LIB_DIR), $(sort $(LIB_OBJECTS)))
+
+$(foreach a, $(LIB_ALGOS), $(eval $(call Add_Template, \
+  LIB_SRCDIRS, \
+  $($(a)_DIR)  \
+)))
+
+$(foreach a, $(LIB_ALGOS), $(eval $(call Add_Template, \
+  LIB_SRCDIRS, \
+  $($(a)_INCDIR)  \
+)))
+LIB_SRCDIRS := $(sort $(LIB_SRCDIRS)) 
+
+$(foreach a, $(LIB_ALGOS), $(eval $(call Add_Template, \
+  LIB_DEFINES, \
+  $($(a)_DEF)  \
+)))
+LIB_DEFINES := $(sort $(LIB_DEFINES)) 
+
 
 #-------------------------------------------------------------------------------
 # define binary object in $(BIN_DIR)$(ALGO)/<obj>
-define Assert_Template
-$(1) = $(2)
-endef
-
 $(foreach a, $(ALGORITHMS), $(eval $(call Assert_Template, \
     $(a)_BINOBJ, \
     $(addprefix $(BIN_DIR)$(call lc,$(a))/,$($(a)_OBJ)) \
@@ -59,7 +91,7 @@ $(foreach a, $(ALGORITHMS), $(eval $(call Assert_Template, \
 
 $(foreach a, $(ALGORITHMS), $(eval $(call Assert_Template, \
     $(a)_TESTBINOBJ, \
-    $(addprefix $(BIN_DIR)$(call lc,$(a))/$(TEST_DIR),$($(a)_TEST_BIN)) \
+    $(addprefix $(BIN_DIR)$(call lc,$(a))/$(TEST_DIR),$($(a)_TESTBIN)) \
 )))
 
 
@@ -100,7 +132,7 @@ $(foreach a, $(ALGORITHMS), \
 )
 
 $(foreach a, $(ALGORITHMS), \
-  $(foreach b, $($(a)_TEST_BIN), \
+  $(foreach b, $($(a)_TESTBIN), \
     $(eval $(call TargetSource_Template, \
       $(BIN_DIR)$(call lc, $(a))/$(TEST_DIR)$(b), \
       $(call find_source_file, $(b), $($(a)_DIR) $($(a)_INCDIR) $(GLOBAL_INCDIR) ),\
@@ -110,15 +142,26 @@ $(foreach a, $(ALGORITHMS), \
   ) \
 )
 
+$(foreach a, $(LIB_OBJECTS), \
+  $(eval $(call TargetSource_Template, \
+    $(a), \
+    $(call find_source_file, $(notdir $(a)), $(LIB_SRCDIRS) ),\
+    $(LIB_SRCDIRS) $(GLOBAL_INCDIR), \
+    $(LIB_DEFINES) \
+    ) \
+  ) \
+)
+
 #-------------------------------------------------------------------------------
 
 define MainTestElf_Template
 $(1): $(2) $(3)
        @echo "[ld]: $(1)"
-       @$(CC) $(CFLAGS_A) $(LDFLAGS)$(patsubst %.elf,%.map,$(1)) -o \
+       @mkdir -p $(dir $(1))
+       $(CC) $(CFLAGS_A) $(LDFLAGS)$(patsubst %.elf,%.map,$(1)) -o \
        $(1) \
        $(2) $(3) \
-       $(LIBS)
+       $(addprefix -l, $(LIBS))
 endef
 
 $(foreach a, $(ALGORITHMS), \
@@ -205,7 +248,7 @@ blockcipher_size: $(foreach algo, $(BLOCK_CIPHERS), $(algo)_SIZE)
 #-------------------------------------------------------------------------------
 
 .PHONY: tests
-tests: $(foreach a, $(ALGORITHMS), $(a)_TEST_BIN)
+tests: $(foreach a, $(ALGORITHMS), $(a)_TESTBIN)
 
 #-------------------------------------------------------------------------------
 
@@ -257,6 +300,31 @@ encodings: $(foreach algo, $(ENCODINGS), $(algo)_OBJ)
 aux: $(foreach algo, $(AUX), $(algo)_OBJ)
 
 
+
+
+.PHONY: lib_info
+lib_info:
+       @echo "LIB_ALGOS ="
+       @echo  $(foreach a, $(LIB_ALGOS), '\t$(a)\n')
+       @echo "LIB_OBJECTS ="
+       @echo  $(foreach a, $(LIB_OBJECTS), '\t$(a)\n')
+       @echo "LIB_SRCDIRS ="
+       @echo  $(foreach a, $(LIB_SRCDIRS), '\t$(a)\n')
+
+$(BIN_DIR)$(LIB_DIR)$(LIB_NAME): $(LIB_OBJECTS)
+       @echo "[rm]:  old $@"
+       @$(RM) -f $@
+       @echo "[chmod]: <objects>"
+       @$(CHMOD) 644 $^
+#      $(CHGRP) root $^
+#      $(CHOWN) root $^
+       @echo "[ar]:  $@ <-- <objects>"
+       @$(AR) qc $@ $^
+
+.PHONY: lib
+lib: $(BIN_DIR)$(LIB_DIR)$(LIB_NAME)
+
+
 #-------------------------------------------------------------------------------
 
 
@@ -286,6 +354,7 @@ info:
        @echo " targets:"
        @echo "  all                - all algorithm cores"
        @echo "  cores              - all algorithm cores"
+       @echo "  lib                - make library archive"
        @echo "  listings           - all algorithm core listings"
        @echo "  tests              - all algorithm test programs"
        @echo "  stats              - all algorithm size statistics"
@@ -313,11 +382,13 @@ info:
 
 .PHONY: clean
 clean:
-       rm -rf $(BIN_DIR)*
+       @echo "[rm]:  $(BIN_DIR)*"
+       @$(RM) -rf $(BIN_DIR)*
 
 .PHONY: depclean
 depclean: clean
-       rm -f $(DEP_DIR)*.d
+       @echo "[rm]:  $(DEP_DIR)*.d"
+       @$(RM) -f $(DEP_DIR)*.d
 
 #-------------------------------------------------------------------------------
 # dependency inclusion

diff --git a/arm-makefile.inc b/arm-makefile.inc
index fe5f5dc58ac8f6641cd40aa5d785d59359824383..e565ddc7f87d0a80fc571ab320bd40165dc36365 100644 (file)
--- a/arm-makefile.inc
+++ b/arm-makefile.inc
@@ -1,6 +1,7 @@
 TOOLCHAIN      = arm-none-eabi-#
 MCU_TARGET     = cortex-m3  
-OPTIMIZE       = -O0
+MCU_OPTS       = -mthumb 
+OPTIMIZE       = -O0 -fomit-frame-pointer  
 DEBUG          = -gdwarf-2
 WARNING        = -pedantic -Wall -Wstrict-prototypes -Werror
 DEFS           = -D$(call uc, $(subst -,_,$(MCU_TARGET)))
@@ -10,50 +11,57 @@ FLASHCMD       = $(OPENOCD) -f openocd.cfg \
                     -c "flash write_image erase $(1) 0 bin" \
                     -c "reset run" \
                     -c "shutdown"
-DEP_DIR        = deps/
-TEST_DIR       = test/
-BIN_DIR        = bin/
-TESTSRC_DIR    = test_src/
+DEP_DIR        = deps/#
+TEST_DIR       = test/#
+BIN_DIR        = bin/#
+TESTSRC_DIR    = test_src/#
 ERASECMD       =
 TESTPORT       = /dev/ttyUSB1
 TESTPORTBAUDR  = 115200
 TESTLOG_DIR    = testlog/#
-TESTPREFIX     = nessie-
+TESTPREFIX     = nessie-#
 SPEEDTOOL      = host/get_performance.rb
-SPEEDLOG_DIR   = speed_log/
+SPEEDLOG_DIR   = speed_log/#
 SPEEDPREFIX    =
 SPEEDCMD       = performance
 SIZE_DIR       = size_log/#
 LIST_DIR       = listings/#
 STAT_DIR       = stats/#
 AUTOASM_DIR    = autoasm/#
+LIB_DIR        = lib/#
+LIB_NAME       = libcrypto.a
 AUTOASM_OPT    = -S
-CC            = $(TOOLCHAIN)gcc
 CSTD           = gnu99
+LIBS           = c gcc
 
-override CFLAGS_A      = -fomit-frame-pointer  \
-                      -mthumb -ffunction-sections -fdata-sections -MMD \
-                      -MF$(DEP_DIR)$(patsubst %.o,%.d,$(notdir $(1)))  \
-                      $(DEBUG) $(WARNING) -std=$(CSTD) $(OPTIMIZE)     \
-                      -mcpu=$(MCU_TARGET) $(DEFS) 
-override CFLAGS        = -fomit-frame-pointer   \
-                      -mthumb -ffunction-sections -fdata-sections -MMD \
-                      -MF$(DEP_DIR)$(patsubst %.o,%.d,$(notdir $@))    \
-                      $(DEBUG) $(WARNING) -std=$(CSTD) $(OPTIMIZE)     \
-                      -mcpu=$(MCU_TARGET) $(DEFS) 
+COMMON_FLAGS   = -ffunction-sections -fdata-sections          \
+                 $(DEBUG) $(WARNING) -std=$(CSTD) $(OPTIMIZE) \
+                 -mcpu=$(MCU_TARGET) $(MCU_OPTS) $(DEFS) -MMD
 
+override CFLAGS_A      = $(COMMON_FLAGS) \
+                      -MF$(DEP_DIR)$(patsubst %.o,%.d,$(notdir $(1))) 
+override CFLAGS        = $(COMMON_FLAGS) \
+                      -MF$(DEP_DIR)$(patsubst %.o,%.d,$(notdir $@))
+                      
 override LDFLAGS       = -g -T lm3s9b90.ld -Wl,--gc-sections    \
-                         -Wl,--entry=reset_isr -lc -lgcc    \
-                          -Wl,-Map,# no space at the end
+                         -Wl,--entry=reset_isr  \
+                         -Wl,-Map,# no space at the end
+                          
 override ASFLAGS          =  -mcpu=$(MCU_TARGET) 
 
 SIZESTAT_FILE = sizestats.txt
 
+CC                 = $(TOOLCHAIN)gcc
 OBJCOPY         = $(TOOLCHAIN)objcopy
 OBJDUMP         = $(TOOLCHAIN)objdump
 SIZE            = $(TOOLCHAIN)size
 OPENOCD         = openocd
 READELF         = readelf
+AR              = $(TOOLCHAIN)ar
+CHMOD           = chmod
+CHOWN           = chown
+CHGRP           = chgrp
+RM              = rm
 RUBY            = ruby
 GET_TEST        = host/get_test.rb
 MAKE            = make

diff --git a/des/des.c b/des/des.c
index f7b99526fa15bf97984e303e81320074f0b5255d..0a27503e016d197e63d730a557b625cded147e63 100644 (file)
--- a/des/des.c
+++ b/des/des.c
@@ -202,10 +202,9 @@ const uint8_t shiftkeyinv_permtab[] = {
 #define ROTTABLE_INV  0x3F7E
 /******************************************************************************/
 
-void permute(uint8_t *ptable, const uint8_t *in, uint8_t *out){
-       uint8_t ib, ob; /* in-bytes and out-bytes */
+void permute(const uint8_t *ptable, const uint8_t *in, uint8_t *out){
+       uint8_t ob; /* in-bytes and out-bytes */
        uint8_t byte, bit; /* counter for bit and byte */
-       ib = ptable[0];
        ob = ptable[1];
        ptable = &(ptable[2]);
        for(byte=0; byte<ob; ++byte){

diff --git a/mkfiles/aes_c.mk b/mkfiles/aes_c.mk
index 2e459bfc58ebc7c084f06c66bdb7bca082a36c8f..50d5c59e7570b2ac1c58966ba5143bf78f06f7b4 100644 (file)
--- a/mkfiles/aes_c.mk
+++ b/mkfiles/aes_c.mk
@@ -11,7 +11,7 @@ $(ALGO_NAME)_OBJ      := aes_enc.o aes_dec.o aes_sbox.o aes_invsbox.o \
                          aes_keyschedule.o gf256mul.o \
                          aes128_enc.o aes128_dec.o aes192_enc.o aes192_dec.o \
                          aes256_enc.o aes256_dec.o
-$(ALGO_NAME)_TEST_BIN := main-aes-test.o $(CLI_STD)  \
+$(ALGO_NAME)_TESTBIN := main-aes-test.o $(CLI_STD)  \
                          nessie_bc_test.o nessie_common.o performance_test.o memxor.o      \
                          bcal_aes128.o bcal_aes192.o bcal_aes256.o bcal-basic.o bcal-cbc.o \
                          keysize_descriptor.o bcal-cfb_byte.o bcal-performance.o      \

diff --git a/mkfiles/arcfour_c.mk b/mkfiles/arcfour_c.mk
index 6daca1c925b621033c94f0b91e3e08ba1baa1865..fccca0789bb39b159e2cc897216c753767f1ce9f 100644 (file)
--- a/mkfiles/arcfour_c.mk
+++ b/mkfiles/arcfour_c.mk
@@ -7,7 +7,7 @@ STREAM_CIPHERS += $(ALGO_NAME)
 $(ALGO_NAME)_DIR      := arcfour/
 $(ALGO_NAME)_INCDIR   := memxor/ scal/
 $(ALGO_NAME)_OBJ      := arcfour.o
-$(ALGO_NAME)_TEST_BIN := main-arcfour-test.o scal_arcfour.o $(CLI_STD) $(SCAL_STD)
+$(ALGO_NAME)_TESTBIN := main-arcfour-test.o scal_arcfour.o $(CLI_STD) $(SCAL_STD)
 $(ALGO_NAME)_NESSIE_TEST      := "nessie"
 $(ALGO_NAME)_PERFORMANCE_TEST := "performance"
 

diff --git a/mkfiles/base64.mk b/mkfiles/base64.mk
index 8abfbccab5dfaf0d3b0a968ec45b0c35cbba413b..23caa3706a7101be1dd261e9a8029b3567665e3e 100644 (file)
--- a/mkfiles/base64.mk
+++ b/mkfiles/base64.mk
@@ -7,7 +7,7 @@ ENCODINGS += $(ALGO_NAME)
 $(ALGO_NAME)_DIR      := base64/
 $(ALGO_NAME)_OBJ      := base64_enc.o base64_dec.o
 $(ALGO_NAME)_INCDIR   := noekeon/ memxor/
-$(ALGO_NAME)_TEST_BIN := main-base64-test.o $(CLI_STD)  \
+$(ALGO_NAME)_TESTBIN := main-base64-test.o $(CLI_STD)  \
                          performance_test.o noekeon.o noekeon_prng.o memxor.o
                         
 $(ALGO_NAME)_PERFORMANCE_TEST := performance

diff --git a/mkfiles/bigint_c.mk b/mkfiles/bigint_c.mk
index 23ce81616d55fe85667d7e71520198a6ae6ba35e..d4929dd15a8e653aa592d9695a26db67d4746e50 100644 (file)
--- a/mkfiles/bigint_c.mk
+++ b/mkfiles/bigint_c.mk
@@ -7,7 +7,7 @@ AUX += $(ALGO_NAME)
 $(ALGO_NAME)_DIR      := bigint/
 $(ALGO_NAME)_INCDIR   := memxor/ noekeon/
 $(ALGO_NAME)_OBJ      := bigint.o bigint_io.o  
-$(ALGO_NAME)_TEST_BIN := main-bigint-test.o $(CLI_STD)  \
+$(ALGO_NAME)_TESTBIN := main-bigint-test.o $(CLI_STD)  \
                          performance_test.o noekeon.o noekeon_prng.o memxor.o
                         
 $(ALGO_NAME)_PERFORMANCE_TEST := performance

diff --git a/mkfiles/blake_c.mk b/mkfiles/blake_c.mk
index f6feec64cbf11f86082935d5e87ac0ec359730f6..4198685a99f7496b9208003ff0278ab9f16a6c1f 100644 (file)
--- a/mkfiles/blake_c.mk
+++ b/mkfiles/blake_c.mk
@@ -7,7 +7,7 @@ HASHES += $(ALGO_NAME)
 $(ALGO_NAME)_DIR      := blake/
 $(ALGO_NAME)_INCDIR   := memxor/ hfal/
 $(ALGO_NAME)_OBJ      := blake_small.o blake_large.o blake_common.o memxor.o
-$(ALGO_NAME)_TEST_BIN := main-blake-test.o hfal_blake_small.o hfal_blake_large.o $(CLI_STD) $(HFAL_STD)
+$(ALGO_NAME)_TESTBIN := main-blake-test.o hfal_blake_small.o hfal_blake_large.o $(CLI_STD) $(HFAL_STD)
 $(ALGO_NAME)_NESSIE_TEST      := test nessie
 $(ALGO_NAME)_PERFORMANCE_TEST := performance
 

diff --git a/mkfiles/bmw_c.mk b/mkfiles/bmw_c.mk
index 839859b83fe3578c5e52242c5c38d42d3b0aaf91..239ecde60c8a91219212ac32caee90f1548a486a 100644 (file)
--- a/mkfiles/bmw_c.mk
+++ b/mkfiles/bmw_c.mk
@@ -7,7 +7,7 @@ HASHES += $(ALGO_NAME)
 $(ALGO_NAME)_DIR      := bmw/
 $(ALGO_NAME)_INCDIR   := memxor/ hfal/
 $(ALGO_NAME)_OBJ      := bmw_small.o bmw_large.o memxor.o
-$(ALGO_NAME)_TEST_BIN := main-bmw-test.o hfal_bmw_small.o hfal_bmw_large.o $(CLI_STD) $(HFAL_STD)
+$(ALGO_NAME)_TESTBIN := main-bmw-test.o hfal_bmw_small.o hfal_bmw_large.o $(CLI_STD) $(HFAL_STD)
 $(ALGO_NAME)_NESSIE_TEST      := test nessie
 $(ALGO_NAME)_PERFORMANCE_TEST := performance
 

diff --git a/mkfiles/bmw_c_speed.mk b/mkfiles/bmw_c_speed.mk
index 42b946548bbc47c06cc752742240a9f93c510ec3..33e1ba838705fd1f81236917593e09693db1f2c5 100644 (file)
--- a/mkfiles/bmw_c_speed.mk
+++ b/mkfiles/bmw_c_speed.mk
@@ -7,7 +7,7 @@ HASHES += $(ALGO_NAME)
 $(ALGO_NAME)_DIR      := bmw/
 $(ALGO_NAME)_INCDIR   := memxor/ hfal/
 $(ALGO_NAME)_OBJ      := bmw_small_speed.o bmw_large_speed.o memxor.o
-$(ALGO_NAME)_TEST_BIN := main-bmw-test.o hfal_bmw_small.o hfal_bmw_large.o $(CLI_STD) $(HFAL_STD)
+$(ALGO_NAME)_TESTBIN := main-bmw-test.o hfal_bmw_small.o hfal_bmw_large.o $(CLI_STD) $(HFAL_STD)
 $(ALGO_NAME)_NESSIE_TEST      := test nessie
 $(ALGO_NAME)_PERFORMANCE_TEST := performance
 

diff --git a/mkfiles/cast5.mk b/mkfiles/cast5.mk
index 085330674f327cbb565284d4d8c3c9745150bf08..016e0f0e41d9c6c3a5db3d4680f0a441cef3d068 100644 (file)
--- a/mkfiles/cast5.mk
+++ b/mkfiles/cast5.mk
@@ -7,7 +7,7 @@ BLOCK_CIPHERS += $(ALGO_NAME)
 $(ALGO_NAME)_DIR      := cast5/
 $(ALGO_NAME)_OBJ      := cast5.o
 $(ALGO_NAME)_INCDIR   := bcal/
-$(ALGO_NAME)_TEST_BIN := main-cast5-test.o bcal_cast5.o $(CLI_STD) $(BCAL_STD)
+$(ALGO_NAME)_TESTBIN := main-cast5-test.o bcal_cast5.o $(CLI_STD) $(BCAL_STD)
 $(ALGO_NAME)_NESSIE_TEST      := "nessie"
 $(ALGO_NAME)_PERFORMANCE_TEST := "performance"
 

diff --git a/mkfiles/cast6.mk b/mkfiles/cast6.mk
index 22289be83fb55249db9a0454bcf4beb1e4c9cbc6..b11da3f92bda77cd1c95dcd1659021b42563bd74 100644 (file)
--- a/mkfiles/cast6.mk
+++ b/mkfiles/cast6.mk
@@ -7,7 +7,7 @@ BLOCK_CIPHERS += $(ALGO_NAME)
 $(ALGO_NAME)_DIR      := cast6/
 $(ALGO_NAME)_OBJ      := cast6.o
 $(ALGO_NAME)_INCDIR   := bcal/
-$(ALGO_NAME)_TEST_BIN := main-cast6-test.o bcal_cast6.o $(CLI_STD) $(BCAL_STD)
+$(ALGO_NAME)_TESTBIN := main-cast6-test.o bcal_cast6.o $(CLI_STD) $(BCAL_STD)
 $(ALGO_NAME)_NESSIE_TEST      := test nessie
 $(ALGO_NAME)_PERFORMANCE_TEST := performance
 

diff --git a/mkfiles/cscipher_small_c.mk b/mkfiles/cscipher_small_c.mk
index 0ae5c23930a074993ee794305372d53c4e008336..f123f97a20d5f5b3be82ccff5f6782190d4f8ac6 100644 (file)
--- a/mkfiles/cscipher_small_c.mk
+++ b/mkfiles/cscipher_small_c.mk
@@ -7,7 +7,7 @@ BLOCK_CIPHERS += $(ALGO_NAME)
 $(ALGO_NAME)_DIR      := cscipher/
 $(ALGO_NAME)_INCDIR   := bcal/ memxor/
 $(ALGO_NAME)_OBJ      := cscipher_small.o cscipher_sbox.o memxor.o 
-$(ALGO_NAME)_TEST_BIN := main-cscipher-test.o bcal_cscipher.o $(CLI_STD) $(BCAL_STD) 
+$(ALGO_NAME)_TESTBIN := main-cscipher-test.o bcal_cscipher.o $(CLI_STD) $(BCAL_STD) 
 $(ALGO_NAME)_NESSIE_TEST      := test nessie
 $(ALGO_NAME)_PERFORMANCE_TEST := performance
 $(ALGO_NAME)_DEF := SBOX_PROG=0

diff --git a/mkfiles/cscipher_tiny_c.mk b/mkfiles/cscipher_tiny_c.mk
index 48b1abb15dd1613b371a5ff83286ab640d536bd9..891ee8ac0aea3803c19f7bc10c431849d8c8a1c5 100644 (file)
--- a/mkfiles/cscipher_tiny_c.mk
+++ b/mkfiles/cscipher_tiny_c.mk
@@ -7,7 +7,7 @@ BLOCK_CIPHERS += $(ALGO_NAME)
 $(ALGO_NAME)_DIR      := cscipher/
 $(ALGO_NAME)_INCDIR   := bcal/ memxor/
 $(ALGO_NAME)_OBJ      := cscipher_small.o memxor.o 
-$(ALGO_NAME)_TEST_BIN := main-cscipher-test.o bcal_cscipher.o $(CLI_STD) $(BCAL_STD) 
+$(ALGO_NAME)_TESTBIN := main-cscipher-test.o bcal_cscipher.o $(CLI_STD) $(BCAL_STD) 
 $(ALGO_NAME)_NESSIE_TEST      := test nessie
 $(ALGO_NAME)_PERFORMANCE_TEST := performance
 $(ALGO_NAME)_DEF := SBOX_PROG=1

diff --git a/mkfiles/cubehash_c.mk b/mkfiles/cubehash_c.mk
index c47561a22c2ff99ecac589ae8c7ca1d0d3d29507..6f068d30cfa42563f260afb1d07ccef7d7033194 100644 (file)
--- a/mkfiles/cubehash_c.mk
+++ b/mkfiles/cubehash_c.mk
@@ -7,7 +7,7 @@ HASHES += $(ALGO_NAME)
 $(ALGO_NAME)_DIR      := cubehash/
 $(ALGO_NAME)_INCDIR   := memxor/ hfal/
 $(ALGO_NAME)_OBJ      := cubehash.o memxor.o
-$(ALGO_NAME)_TEST_BIN := main-cubehash-test.o hfal_cubehash.o  $(CLI_STD) $(HFAL_STD)
+$(ALGO_NAME)_TESTBIN := main-cubehash-test.o hfal_cubehash.o  $(CLI_STD) $(HFAL_STD)
 $(ALGO_NAME)_NESSIE_TEST      := test nessie
 $(ALGO_NAME)_PERFORMANCE_TEST := performance
 

diff --git a/mkfiles/des.mk b/mkfiles/des.mk
index 1390d7544e909e0a469517dd39d51ec702160a67..1c6759a0c83c42fda3721d6d6b0d725b36edc8d2 100644 (file)
--- a/mkfiles/des.mk
+++ b/mkfiles/des.mk
@@ -7,7 +7,7 @@ BLOCK_CIPHERS += $(ALGO_NAME)
 $(ALGO_NAME)_DIR      := des/
 $(ALGO_NAME)_OBJ      := des.o
 $(ALGO_NAME)_INCDIR   := bcal/
-$(ALGO_NAME)_TEST_BIN := main-des-test.o bcal_des.o $(CLI_STD) $(BCAL_STD)
+$(ALGO_NAME)_TESTBIN := main-des-test.o bcal_des.o $(CLI_STD) $(BCAL_STD)
 $(ALGO_NAME)_NESSIE_TEST      := "nessie"
 $(ALGO_NAME)_PERFORMANCE_TEST := "performance"
 

diff --git a/mkfiles/echo_c.mk b/mkfiles/echo_c.mk
index 2d80958644913a6d36035f12a9cea4e4b0b01ffb..56c3330f663696d83c680612c417ff0d6f3a6a08 100644 (file)
--- a/mkfiles/echo_c.mk
+++ b/mkfiles/echo_c.mk
@@ -7,7 +7,7 @@ HASHES += $(ALGO_NAME)
 $(ALGO_NAME)_DIR      := echo/
 $(ALGO_NAME)_INCDIR   := memxor/ aes/ gf256mul/ hfal/
 $(ALGO_NAME)_OBJ      := echo.o memxor.o aes_enc_round.o aes_sbox.o gf256mul.o
-$(ALGO_NAME)_TEST_BIN := main-echo-test.o hfal_echo.o  $(CLI_STD) $(HFAL_STD)
+$(ALGO_NAME)_TESTBIN := main-echo-test.o hfal_echo.o  $(CLI_STD) $(HFAL_STD)
 $(ALGO_NAME)_NESSIE_TEST      := test nessie
 $(ALGO_NAME)_PERFORMANCE_TEST := performance
 

diff --git a/mkfiles/grain.mk b/mkfiles/grain.mk
index 22ff6190a7355446fe8e4a8a3baa0dccaf31d203..f513e4eaefed4f31738682793d83864c5c1aaca4 100644 (file)
--- a/mkfiles/grain.mk
+++ b/mkfiles/grain.mk
@@ -7,7 +7,7 @@ STREAM_CIPHERS += $(ALGO_NAME)
 $(ALGO_NAME)_DIR      := grain/
 $(ALGO_NAME)_OBJ      := grain.o
 $(ALGO_NAME)_INCDIR   := memxor/ scal/
-$(ALGO_NAME)_TEST_BIN := main-grain-test.o $(CLI_STD) $(SCAL_STD) scal_grain.o
+$(ALGO_NAME)_TESTBIN := main-grain-test.o $(CLI_STD) $(SCAL_STD) scal_grain.o
 $(ALGO_NAME)_NESSIE_TEST      := "nessie"
 $(ALGO_NAME)_PERFORMANCE_TEST := "performance"
 $(ALGO_NAME)_DEF := NESSIE_ESTREAM=1

diff --git a/mkfiles/groestl_c.mk b/mkfiles/groestl_c.mk
index c219abf5d2b1c95b394cf834dfa974de6a2cb9fc..f8513df069a069ba0adb62890fbc0e42f35e031c 100644 (file)
--- a/mkfiles/groestl_c.mk
+++ b/mkfiles/groestl_c.mk
@@ -7,7 +7,7 @@ HASHES += $(ALGO_NAME)
 $(ALGO_NAME)_DIR      := groestl/
 $(ALGO_NAME)_INCDIR   := memxor/ aes/ gf256mul/ hfal/
 $(ALGO_NAME)_OBJ      := groestl_small.o groestl_large.o memxor.o aes_sbox.o gf256mul.o
-$(ALGO_NAME)_TEST_BIN := hfal_groestl_large.o hfal_groestl_small.o main-groestl-test.o $(CLI_STD) $(HFAL_STD)
+$(ALGO_NAME)_TESTBIN := hfal_groestl_large.o hfal_groestl_small.o main-groestl-test.o $(CLI_STD) $(HFAL_STD)
 $(ALGO_NAME)_NESSIE_TEST      := test nessie
 $(ALGO_NAME)_PERFORMANCE_TEST := performance
 

diff --git a/mkfiles/jh_simple_small_c.mk b/mkfiles/jh_simple_small_c.mk
index 51d0c7418a3f268e0d7637da47e2d935554bcbba..836186e3e64a498e921cbe32e64efca9e79e2469 100644 (file)
--- a/mkfiles/jh_simple_small_c.mk
+++ b/mkfiles/jh_simple_small_c.mk
@@ -7,7 +7,7 @@ HASHES += $(ALGO_NAME)
 $(ALGO_NAME)_DIR      := jh/
 $(ALGO_NAME)_INCDIR   := hfal/ memxor/
 $(ALGO_NAME)_OBJ      := jh_simple_small_core.o jh_simple_aux.o  memxor.o 
-$(ALGO_NAME)_TEST_BIN := hfal_jh.o main-jh-test.o $(CLI_STD) $(HFAL_STD)
+$(ALGO_NAME)_TESTBIN := hfal_jh.o main-jh-test.o $(CLI_STD) $(HFAL_STD)
 $(ALGO_NAME)_NESSIE_TEST      := test nessie
 $(ALGO_NAME)_PERFORMANCE_TEST := performance
 

diff --git a/mkfiles/jh_simple_speed_c.mk b/mkfiles/jh_simple_speed_c.mk
index 3cfd6ea4ba67d2bb13a14753f406c6297b2271f8..7916a1d89d9b8e6cbee2236cdb17756413944f30 100644 (file)
--- a/mkfiles/jh_simple_speed_c.mk
+++ b/mkfiles/jh_simple_speed_c.mk
@@ -7,7 +7,7 @@ HASHES += $(ALGO_NAME)
 $(ALGO_NAME)_DIR      := jh/
 $(ALGO_NAME)_INCDIR   := hfal/ memxor/
 $(ALGO_NAME)_OBJ      := jh_simple_speed_core.o jh_simple_aux.o jh_tables.o memxor.o 
-$(ALGO_NAME)_TEST_BIN := hfal_jh.o main-jh-test.o $(CLI_STD) $(HFAL_STD)
+$(ALGO_NAME)_TESTBIN := hfal_jh.o main-jh-test.o $(CLI_STD) $(HFAL_STD)
 $(ALGO_NAME)_NESSIE_TEST      := test nessie
 $(ALGO_NAME)_PERFORMANCE_TEST := performance
 

diff --git a/mkfiles/keccak_c.mk b/mkfiles/keccak_c.mk
index a76ff4277e42fc8be8373a96ffacd341f5fd09d9..65d20e2986f4395e3e82bc42bf02b977b4a19c4e 100644 (file)
--- a/mkfiles/keccak_c.mk
+++ b/mkfiles/keccak_c.mk
@@ -7,7 +7,7 @@ HASHES += $(ALGO_NAME)
 $(ALGO_NAME)_DIR      := keccak/
 $(ALGO_NAME)_INCDIR   := memxor/ hfal/
 $(ALGO_NAME)_OBJ      := keccak.o memxor.o
-$(ALGO_NAME)_TEST_BIN := main-keccak-test.o hfal_keccak.o  $(CLI_STD) $(HFAL_STD)
+$(ALGO_NAME)_TESTBIN := main-keccak-test.o hfal_keccak.o  $(CLI_STD) $(HFAL_STD)
 $(ALGO_NAME)_NESSIE_TEST      := test nessie
 $(ALGO_NAME)_PERFORMANCE_TEST := performance
 

diff --git a/mkfiles/khazad_small_c.mk b/mkfiles/khazad_small_c.mk
index ee679396c35c473333001762ba64d48b63771f35..b072e71c93b04b610a8f00b0628db3f1915a54ee 100644 (file)
--- a/mkfiles/khazad_small_c.mk
+++ b/mkfiles/khazad_small_c.mk
@@ -7,7 +7,7 @@ BLOCK_CIPHERS += $(ALGO_NAME)
 $(ALGO_NAME)_DIR      := khazad/
 $(ALGO_NAME)_INCDIR   := bcal/ memxor/ gf256mul/
 $(ALGO_NAME)_OBJ      := khazad.o memxor.o gf256mul.o
-$(ALGO_NAME)_TEST_BIN := main-khazad-test.o bcal_khazad.o $(CLI_STD) $(BCAL_STD) 
+$(ALGO_NAME)_TESTBIN := main-khazad-test.o bcal_khazad.o $(CLI_STD) $(BCAL_STD) 
 $(ALGO_NAME)_NESSIE_TEST      := test nessie
 $(ALGO_NAME)_PERFORMANCE_TEST := performance
 $(ALGO_NAME)_DEF := SBOX_PROG=0

diff --git a/mkfiles/mickey128.mk b/mkfiles/mickey128.mk
index 49a709c6d42081fe894e8bdd9a95e4b7119d8881..fc0b1f45606f7f189f97d99ad4582ded4f131a98 100644 (file)
--- a/mkfiles/mickey128.mk
+++ b/mkfiles/mickey128.mk
@@ -7,7 +7,7 @@ STREAM_CIPHERS += $(ALGO_NAME)
 $(ALGO_NAME)_DIR      := mickey128/
 $(ALGO_NAME)_OBJ      := mickey128.o
 $(ALGO_NAME)_INCDIR   := memxor/ scal/
-$(ALGO_NAME)_TEST_BIN := main-mickey128-test.o $(CLI_STD) $(SCAL_STD) scal_mickey128.o 
+$(ALGO_NAME)_TESTBIN := main-mickey128-test.o $(CLI_STD) $(SCAL_STD) scal_mickey128.o 
 $(ALGO_NAME)_NESSIE_TEST      := "nessie"
 $(ALGO_NAME)_PERFORMANCE_TEST := "performance"
 $(ALGO_NAME)_DEF := NESSIE_ESTREAM=1

diff --git a/mkfiles/noekeon_c.mk b/mkfiles/noekeon_c.mk
index 4401b695baa8c2868e7b1f8667a45ebe30af1ff7..370df76eb0b6eee6c871116731026247b69ab130 100644 (file)
--- a/mkfiles/noekeon_c.mk
+++ b/mkfiles/noekeon_c.mk
@@ -8,7 +8,7 @@ BLOCK_CIPHERS += $(ALGO_NAME)
 $(ALGO_NAME)_OBJ      := noekeon.o
 $(ALGO_NAME)_DIR      := noekeon/
 $(ALGO_NAME)_INCDIR   := bcal/
-$(ALGO_NAME)_TEST_BIN := main-noekeon-test.o bcal_noekeon.o $(CLI_STD) $(BCAL_STD)
+$(ALGO_NAME)_TESTBIN := main-noekeon-test.o bcal_noekeon.o $(CLI_STD) $(BCAL_STD)
 $(ALGO_NAME)_NESSIE_TEST      := test nessie
 $(ALGO_NAME)_PERFORMANCE_TEST := performance
 

diff --git a/mkfiles/present.mk b/mkfiles/present.mk
index 7e16fe90fefeff1a4e557a8667627d01d39078b4..e3154a71b5441a4b80fa65928e20fb01f6ec0a0d 100644 (file)
--- a/mkfiles/present.mk
+++ b/mkfiles/present.mk
@@ -7,7 +7,7 @@ BLOCK_CIPHERS += $(ALGO_NAME)
 $(ALGO_NAME)_DIR      := present/
 $(ALGO_NAME)_OBJ      := present.o
 $(ALGO_NAME)_INCDIR   := bcal/
-$(ALGO_NAME)_TEST_BIN := main-present-test.o bcal_present.o $(CLI_STD) $(BCAL_STD)
+$(ALGO_NAME)_TESTBIN := main-present-test.o bcal_present.o $(CLI_STD) $(BCAL_STD)
 $(ALGO_NAME)_NESSIE_TEST      := "nessie"
 $(ALGO_NAME)_PERFORMANCE_TEST := "performance"
 

diff --git a/mkfiles/rabbit_c.mk b/mkfiles/rabbit_c.mk
index a43b0f4dc344c484e14793997b6606ac648893a6..bc19ac17cc06e7898a5f6ccaac8590b98160da10 100644 (file)
--- a/mkfiles/rabbit_c.mk
+++ b/mkfiles/rabbit_c.mk
@@ -7,7 +7,7 @@ STREAM_CIPHERS += $(ALGO_NAME)
 $(ALGO_NAME)_DIR      := rabbit/
 $(ALGO_NAME)_OBJ      := rabbit_c.o
 $(ALGO_NAME)_INCDIR   := memxor/ scal/
-$(ALGO_NAME)_TEST_BIN := main-rabbit-test.o $(CLI_STD) $(SCAL_STD) scal_rabbit.o
+$(ALGO_NAME)_TESTBIN := main-rabbit-test.o $(CLI_STD) $(SCAL_STD) scal_rabbit.o
 $(ALGO_NAME)_NESSIE_TEST      := "nessie"
 $(ALGO_NAME)_PERFORMANCE_TEST := "performance"
 $(ALGO_NAME)_DEF := ESTREAM=0

diff --git a/mkfiles/rabbit_estream_c.mk b/mkfiles/rabbit_estream_c.mk
index 5070e41869a48831e6153125af0db7399a3b0ef5..9277f67181b7007affb1dfc1d4ab18f0487142bd 100644 (file)
--- a/mkfiles/rabbit_estream_c.mk
+++ b/mkfiles/rabbit_estream_c.mk
@@ -7,7 +7,7 @@ STREAM_CIPHERS += $(ALGO_NAME)
 $(ALGO_NAME)_DIR      := rabbit/
 $(ALGO_NAME)_OBJ      := rabbit_c.o
 $(ALGO_NAME)_INCDIR   := memxor/ scal/
-$(ALGO_NAME)_TEST_BIN := main-rabbit-test.o $(CLI_STD) $(SCAL_STD) scal_rabbit.o
+$(ALGO_NAME)_TESTBIN := main-rabbit-test.o $(CLI_STD) $(SCAL_STD) scal_rabbit.o
 $(ALGO_NAME)_NESSIE_TEST      := "nessie"
 $(ALGO_NAME)_PERFORMANCE_TEST := "performance"
 $(ALGO_NAME)_DEF := ESTREAM=1

diff --git a/mkfiles/rc5.mk b/mkfiles/rc5.mk
index 1e9e369366163b4cc00b2fefd4c125802bd02572..9f836a3ef74d9cf42f8cc269e8fe0de679e71fa5 100644 (file)
--- a/mkfiles/rc5.mk
+++ b/mkfiles/rc5.mk
@@ -7,7 +7,7 @@ BLOCK_CIPHERS += $(ALGO_NAME)
 $(ALGO_NAME)_DIR      := rc5/
 $(ALGO_NAME)_OBJ      := rc5.o
 $(ALGO_NAME)_INCDIR   := bcal/
-$(ALGO_NAME)_TEST_BIN := main-rc5-test.o bcal_rc5.o $(CLI_STD) $(BCAL_STD) 
+$(ALGO_NAME)_TESTBIN := main-rc5-test.o bcal_rc5.o $(CLI_STD) $(BCAL_STD) 
 $(ALGO_NAME)_NESSIE_TEST      := test nessie
 $(ALGO_NAME)_PERFORMANCE_TEST := performance
 

diff --git a/mkfiles/rc6.mk b/mkfiles/rc6.mk
index 0c9241ace373badd29a0059f1468b59eaf3c2e2e..e9a0a1ea6e0fcf5257c10d042bbb9646f3ef33d5 100644 (file)
--- a/mkfiles/rc6.mk
+++ b/mkfiles/rc6.mk
@@ -7,7 +7,7 @@ BLOCK_CIPHERS += $(ALGO_NAME)
 $(ALGO_NAME)_DIR      := rc6/
 $(ALGO_NAME)_OBJ      := rc6.o
 $(ALGO_NAME)_INCDIR   := bcal/
-$(ALGO_NAME)_TEST_BIN := main-rc6-test.o bcal_rc6.o $(CLI_STD) $(BCAL_STD) 
+$(ALGO_NAME)_TESTBIN := main-rc6-test.o bcal_rc6.o $(CLI_STD) $(BCAL_STD) 
 $(ALGO_NAME)_NESSIE_TEST      := test nessie
 $(ALGO_NAME)_PERFORMANCE_TEST := performance
 

diff --git a/mkfiles/salsa20_c.mk b/mkfiles/salsa20_c.mk
index 32b4fac27e59fe730be3b8174d27cbf7aed1dda2..79169db32fd60941bb8be933005607c0a767e4ed 100644 (file)
--- a/mkfiles/salsa20_c.mk
+++ b/mkfiles/salsa20_c.mk
@@ -7,7 +7,7 @@ STREAM_CIPHERS += $(ALGO_NAME)
 $(ALGO_NAME)_DIR      := salsa20/
 $(ALGO_NAME)_OBJ      := salsa20.o
 $(ALGO_NAME)_INCDIR   := memxor/ scal/
-$(ALGO_NAME)_TEST_BIN := main-salsa20-test.o $(CLI_STD) $(SCAL_STD) scal_salsa20.o
+$(ALGO_NAME)_TESTBIN := main-salsa20-test.o $(CLI_STD) $(SCAL_STD) scal_salsa20.o
 $(ALGO_NAME)_NESSIE_TEST      := "nessie"
 $(ALGO_NAME)_PERFORMANCE_TEST := "performance"
 

diff --git a/mkfiles/seed_c.mk b/mkfiles/seed_c.mk
index f07f643ea0c8061e04ca3f8e3fa4e0c0fe5962fa..ae08e735dbcf356d0a8c004a12dd5fadb81b2a9f 100644 (file)
--- a/mkfiles/seed_c.mk
+++ b/mkfiles/seed_c.mk
@@ -7,7 +7,7 @@ BLOCK_CIPHERS += $(ALGO_NAME)
 $(ALGO_NAME)_DIR      := seed/
 $(ALGO_NAME)_OBJ      := seed_c.o seed_sbox.o
 $(ALGO_NAME)_INCDIR   := bcal/
-$(ALGO_NAME)_TEST_BIN := main-seed-test.o bcal_seed.o $(CLI_STD) $(BCAL_STD) 
+$(ALGO_NAME)_TESTBIN := main-seed-test.o bcal_seed.o $(CLI_STD) $(BCAL_STD) 
 $(ALGO_NAME)_NESSIE_TEST      := "nessie"
 $(ALGO_NAME)_PERFORMANCE_TEST := "performance"
 

diff --git a/mkfiles/serpent-bitslice.mk b/mkfiles/serpent-bitslice.mk
index 142d8d7e52e35b142f21f7aadd99ee2754d4548e..9f4591ec0fad760b01938f3a37e6c91beb226644 100644 (file)
--- a/mkfiles/serpent-bitslice.mk
+++ b/mkfiles/serpent-bitslice.mk
@@ -7,7 +7,7 @@ BLOCK_CIPHERS += $(ALGO_NAME)
 $(ALGO_NAME)_DIR      := serpent/
 $(ALGO_NAME)_INCDIR   := bcal/ memxor/
 $(ALGO_NAME)_OBJ      := serpent.o serpent-sboxes-bitslice.o memxor.o
-$(ALGO_NAME)_TEST_BIN := main-serpent-test.o bcal_serpent.o $(CLI_STD) $(BCAL_STD)
+$(ALGO_NAME)_TESTBIN := main-serpent-test.o bcal_serpent.o $(CLI_STD) $(BCAL_STD)
 $(ALGO_NAME)_NESSIE_TEST      := "nessie"
 $(ALGO_NAME)_PERFORMANCE_TEST := "performance"
 

diff --git a/mkfiles/serpent_c.mk b/mkfiles/serpent_c.mk
index 8e7194095c388376fa9d01b6193cce07001cd2a6..dd1fbc62adbd1ba7253acc5022b62ffa8e0d843b 100644 (file)
--- a/mkfiles/serpent_c.mk
+++ b/mkfiles/serpent_c.mk
@@ -7,7 +7,7 @@ BLOCK_CIPHERS += $(ALGO_NAME)
 $(ALGO_NAME)_DIR      := serpent/
 $(ALGO_NAME)_INCDIR   := bcal/ memxor/
 $(ALGO_NAME)_OBJ      := serpent.o serpent-sboxes_c.o memxor.o
-$(ALGO_NAME)_TEST_BIN := main-serpent-test.o bcal_serpent.o $(CLI_STD) $(BCAL_STD)
+$(ALGO_NAME)_TESTBIN := main-serpent-test.o bcal_serpent.o $(CLI_STD) $(BCAL_STD)
 $(ALGO_NAME)_NESSIE_TEST      := "nessie"
 $(ALGO_NAME)_PERFORMANCE_TEST := "performance"
 

diff --git a/mkfiles/sha1_c.mk b/mkfiles/sha1_c.mk
index d77ca264e2493508ac22970f859af1e61d0380d6..d231269703cde7fb1fe208979db5b0b76082cabf 100644 (file)
--- a/mkfiles/sha1_c.mk
+++ b/mkfiles/sha1_c.mk
@@ -7,7 +7,7 @@ HASHES += $(ALGO_NAME)
 $(ALGO_NAME)_DIR      := sha1/
 $(ALGO_NAME)_INCDIR   := hfal/
 $(ALGO_NAME)_OBJ      := sha1.o
-$(ALGO_NAME)_TEST_BIN := main-sha1-test.o hfal_sha1.o $(CLI_STD) $(HFAL_STD)
+$(ALGO_NAME)_TESTBIN := main-sha1-test.o hfal_sha1.o $(CLI_STD) $(HFAL_STD)
 $(ALGO_NAME)_NESSIE_TEST      := "nessie"
 $(ALGO_NAME)_PERFORMANCE_TEST := "performance"
 

diff --git a/mkfiles/sha256_c.mk b/mkfiles/sha256_c.mk
index ec9bc6e6402e85e3649fdbd9f96f1d1fd0aa332c..734184c37c3ece7f2905d8f3fba7f542bcbae576 100644 (file)
--- a/mkfiles/sha256_c.mk
+++ b/mkfiles/sha256_c.mk
@@ -7,7 +7,7 @@ HASHES += $(ALGO_NAME)
 $(ALGO_NAME)_DIR      := sha256/
 $(ALGO_NAME)_INCDIR   := hfal/
 $(ALGO_NAME)_OBJ      := sha256.o
-$(ALGO_NAME)_TEST_BIN := main-sha256-test.o $(CLI_STD) $(HFAL_STD) hfal_sha256.o 
+$(ALGO_NAME)_TESTBIN := main-sha256-test.o $(CLI_STD) $(HFAL_STD) hfal_sha256.o 
 $(ALGO_NAME)_NESSIE_TEST      := "nessie"
 $(ALGO_NAME)_PERFORMANCE_TEST := "performance"
 

diff --git a/mkfiles/shabal_c.mk b/mkfiles/shabal_c.mk
index 6b0ff0ad748e4866add18f8112e4f65d10bcb90b..2e9860aeda386d1e837a9e4b02a3d5c35408f9ba 100644 (file)
--- a/mkfiles/shabal_c.mk
+++ b/mkfiles/shabal_c.mk
@@ -7,7 +7,7 @@ HASHES += $(ALGO_NAME)
 $(ALGO_NAME)_DIR      := shabal/
 $(ALGO_NAME)_INCDIR   := hfal/
 $(ALGO_NAME)_OBJ      := shabal.o shabal192.o shabal224.o shabal256.o shabal384.o shabal512.o
-$(ALGO_NAME)_TEST_BIN := main-shabal-test.o hfal_shabal.o $(CLI_STD) $(HFAL_STD)
+$(ALGO_NAME)_TESTBIN := main-shabal-test.o hfal_shabal.o $(CLI_STD) $(HFAL_STD)
 $(ALGO_NAME)_NESSIE_TEST      := test nessie
 $(ALGO_NAME)_PERFORMANCE_TEST := performance
 

diff --git a/mkfiles/skein_c.mk b/mkfiles/skein_c.mk
index 3e94a4105cd8868542fc8f89b619124de467ecd5..cded5744bb7eb46a999153086f230d7a689af6ba 100644 (file)
--- a/mkfiles/skein_c.mk
+++ b/mkfiles/skein_c.mk
@@ -8,7 +8,7 @@ $(ALGO_NAME)_DIR      := skein/
 $(ALGO_NAME)_INCDIR   := threefish/ memxor/ hfal/
 $(ALGO_NAME)_OBJ      := threefish256_enc.o threefish512_enc.o threefish1024_enc.o threefish_mix_c.o\
                          ubi256.o ubi512.o ubi1024.o memxor.o skein256.o skein512.o skein1024.o
-$(ALGO_NAME)_TEST_BIN := main-skein-test.o hfal_skein256.o hfal_skein512.o hfal_skein1024.o $(CLI_STD) $(HFAL_STD)
+$(ALGO_NAME)_TESTBIN := main-skein-test.o hfal_skein256.o hfal_skein512.o hfal_skein1024.o $(CLI_STD) $(HFAL_STD)
 $(ALGO_NAME)_NESSIE_TEST      := test nessie
 $(ALGO_NAME)_PERFORMANCE_TEST := performance
 

diff --git a/mkfiles/tdes.mk b/mkfiles/tdes.mk
index c772210105972fdc7c9a787ebe28f4545ff9e038..a753bc048f4d4c9e1367df8d94e03ded862a204e 100644 (file)
--- a/mkfiles/tdes.mk
+++ b/mkfiles/tdes.mk
@@ -7,7 +7,7 @@ BLOCK_CIPHERS += $(ALGO_NAME)
 $(ALGO_NAME)_DIR      := des/
 $(ALGO_NAME)_OBJ      := des.o
 $(ALGO_NAME)_INCDIR   := bcal/
-$(ALGO_NAME)_TEST_BIN := main-tdes-test.o bcal_tdes.o bcal_tdes2.o $(CLI_STD) $(BCAL_STD) 
+$(ALGO_NAME)_TESTBIN := main-tdes-test.o bcal_tdes.o bcal_tdes2.o $(CLI_STD) $(BCAL_STD) 
 $(ALGO_NAME)_NESSIE_TEST      := "nessie"
 $(ALGO_NAME)_PERFORMANCE_TEST := "performance"
 

diff --git a/mkfiles/trivium.mk b/mkfiles/trivium.mk
index e6ac3538735fe1babdb21b89246c180068f7ae64..52c531700cd8b1fd500cb2ffe5da1e7deb4666cd 100644 (file)
--- a/mkfiles/trivium.mk
+++ b/mkfiles/trivium.mk
@@ -7,7 +7,7 @@ STREAM_CIPHERS += $(ALGO_NAME)
 $(ALGO_NAME)_DIR      := trivium/
 $(ALGO_NAME)_OBJ      := trivium.o
 $(ALGO_NAME)_INCDIR   := memxor/ scal/
-$(ALGO_NAME)_TEST_BIN := main-trivium-test.o $(CLI_STD) $(SCAL_STD) scal_trivium.o 
+$(ALGO_NAME)_TESTBIN := main-trivium-test.o $(CLI_STD) $(SCAL_STD) scal_trivium.o 
 $(ALGO_NAME)_NESSIE_TEST      := "nessie"
 $(ALGO_NAME)_PERFORMANCE_TEST := "performance"
 $(ALGO_NAME)_DEF       := NESSIE_ESTREAM=1

diff --git a/mkfiles/xtea_c.mk b/mkfiles/xtea_c.mk
index 8e37ec3176e4ce4e1d3ac076f65dd103e17b1f9b..08c1d324a62994debf72e2cd5028becc9681665d 100644 (file)
--- a/mkfiles/xtea_c.mk
+++ b/mkfiles/xtea_c.mk
@@ -7,7 +7,7 @@ BLOCK_CIPHERS += $(ALGO_NAME)
 $(ALGO_NAME)_DIR      := xtea/
 $(ALGO_NAME)_OBJ      := xtea.o
 $(ALGO_NAME)_INCDIR   := bcal/
-$(ALGO_NAME)_TEST_BIN := main-xtea-test.o bcal_xtea.o $(CLI_STD) $(BCAL_STD)
+$(ALGO_NAME)_TESTBIN := main-xtea-test.o bcal_xtea.o $(CLI_STD) $(BCAL_STD)
 $(ALGO_NAME)_NESSIE_TEST      := "nessie"
 $(ALGO_NAME)_PERFORMANCE_TEST := "performance"
 

diff --git a/mkfiles/zzz_lib.mk b/mkfiles/zzz_lib.mk
new file mode 100644 (file)
index 0000000..04dcb0d
--- /dev/null
+++ b/mkfiles/zzz_lib.mk
@@ -0,0 +1,35 @@
+LIB_ALGOS:= \
+    AES_C \
+    ARCFOUR_C \
+    BASE64 \
+    BIGINT_C \
+    BLAKE_C \
+    BMW \
+    CAST5 \
+    CAST6 \
+    CSCIPHER_SMALL_C \
+    CUBEHASH_C \
+    DES \
+    DSA \
+    ECHO_C \
+    GRAIN \
+    GROESTL_C \
+    JH_SIMPLE_SMALL_C \
+    KECCAK_C \
+    KHAZAD_SMALL_C \
+    MICKEY128 \
+    NOEKEON_C \
+    PRESENT \
+    RABBIT_C \
+    RC5 \
+    RC6 \
+    SALSA20_C \
+    SEED_C \
+    SERPENT_BITSLICE \
+    SHA1_C \
+    SHA256_C \
+    SHABAL_C \
+    SKEIN_C \
+    TDES \
+    TRIVIUM \
+    XTEA_C