removement of debug/unfinished code

diff --git a/Makefile b/Makefile
index 3b65518fce0d6ae61f016a8fea8e4a74caa9aa50..f2611af072f7fa8ffcaa0a8b5f407f629e299144 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -70,14 +70,6 @@ info:
        @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)"
        
@@ -166,8 +158,9 @@ $(1)_FLASH: $(2)
        @$(FLASHCMD)$(call first,$(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 FLASH_TEMPLATE, $(algo), \
+#                $(patsubst $(BIN_DIR)%.o,$(TESTBIN_DIR)%.hex,$(firstword $($(algo)_TEST_BIN)))) ))  
+$(foreach algo, $(ALGORITHMS),$(eval $(call FLASH_TEMPLATE, $(algo), $(TESTBIN_DIR)main-$(call lc,$(algo))-test.hex) ))  
 
 #-------------------------------------------------------------------------------
 

diff --git a/mkfiles/mickey128.mk b/mkfiles/mickey128.mk
deleted file mode 100644 (file)
index 3cb7a42..0000000
--- a/mkfiles/mickey128.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Makefile for Mickey128
-ALGO_NAME := MICKEY128
-
-# comment out the following line for removement of Mickey128 from the build process
-STREAM_CIPHERS += $(ALGO_NAME)
-
-$(ALGO_NAME)_OBJ      := mickey128.o
-$(ALGO_NAME)_TEST_BIN := main-mickey128-test.o debug.o uart.o serial-tools.o \
-                         nessie_stream_test.o nessie_common.o mickey128.o cli.o
-$(ALGO_NAME)_NESSIE_TEST      := "nessie"
-$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
-

diff --git a/noekeon.c b/noekeon.c
index 7627cc15b91f98caddf48186ae50946ce4b79268..5508c29520ac1a50ee744ab9da59b34509b682ef 100644 (file)
--- a/noekeon.c
+++ b/noekeon.c
@@ -29,7 +29,7 @@
 #include <string.h>
 #include <avr/pgmspace.h>
 #include "noekeon.h"
-#include "uart.h"
+// #include "uart.h"
 
 #define ROUND_NR 16
 
@@ -160,8 +160,8 @@ void noekeon_dec(void* buffer, void* key){
        memcpy(dkey, key, 16);
        
        theta((uint32_t*)nullv, (uint32_t*)dkey);
-       uart_putstr_P(PSTR("\r\nTheta: "));
-       uart_hexdump(dkey, 16);
+//     uart_putstr_P(PSTR("\r\nTheta: "));
+//     uart_hexdump(dkey, 16);
        
        for(i=ROUND_NR-1; i>=0; --i){
                rc = pgm_read_byte(rc_tab+i);