X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=test_src%2Fmain-noekeon-test.c;h=1b6f55004396b7c42bafa705cfb676e1a3ece0ff;hp=ad60d7acc24116a5103aa00cb8a02f5b605e3d43;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hpb=548902530e99ffda615113aee335956ea92aab7c

diff --git a/test_src/main-noekeon-test.c b/test_src/main-noekeon-test.c
index ad60d7a..1b6f550 100644
--- a/test_src/main-noekeon-test.c
+++ b/test_src/main-noekeon-test.c
@@ -1,7 +1,7 @@
 /* main-noekeon-test.c */
 /*
     This file is part of the AVR-Crypto-Lib.
-    Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
+    Copyright (C) 2006-2015 Daniel Otte (bg@nerilex.org)
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,26 +21,17 @@
  * 
 */
 
-#include "config.h"
-
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "noekeon.h"
-#include "nessie_bc_test.h"
 #include "bcal-nessie.h"
 #include "performance_test.h"
 #include "bcal-performance.h"
 #include "bcal_noekeon.h"
-#include "cli.h"
-
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
 
-char* algo_name = "Noekeon";
+char *algo_name = "Noekeon";
 
-const bcdesc_t* algolist[] PROGMEM = {
+const bcdesc_t *const algolist[] PROGMEM = {
 	(bcdesc_t*)&noekeon_direct_desc,
 	(bcdesc_t*)&noekeon_indirect_desc,
 	NULL
@@ -50,11 +41,11 @@ const bcdesc_t* algolist[] PROGMEM = {
  *****************************************************************************/
 
 void testrun_nessie_noekeon(void){
-	bcal_nessie_multiple(&algolist);
+	bcal_nessie_multiple(algolist);
 }
 
 
-void testrun_stdtest_rundirect(void* data, void* key){
+void testrun_stdtest_rundirect(void *data, void *key){
 	cli_putstr_P(PSTR("\r\n                     "));
 	cli_putstr_P(PSTR("k = "));
 	cli_hexdump(key,16);
@@ -73,7 +64,7 @@ void testrun_stdtest_rundirect(void* data, void* key){
 	cli_putstr_P(PSTR("\r\n"));
 }
 
-void testrun_stdtest_runindirect(void* data, void* key){
+void testrun_stdtest_runindirect(void *data, void *key){
 	noekeon_ctx_t ctx;
 	cli_putstr_P(PSTR("\r\n                     "));
 	cli_putstr_P(PSTR("k = "));
@@ -154,7 +145,7 @@ const char indirect_str[]    PROGMEM = "indirect";
 const char performance_str[] PROGMEM = "performance";
 const char echo_str[]        PROGMEM = "echo";
 
-cmdlist_entry_t cmdlist[] PROGMEM = {
+const cmdlist_entry_t cmdlist[] PROGMEM = {
 	{ nessie_str,      NULL, testrun_nessie_noekeon},
 	{ test_str,        NULL, testrun_stdtest_noekeon},
 //	{ direct_str,      NULL, testrun_nessie_noekeon_direct},
@@ -165,14 +156,10 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 };
 
 int main (void){
-	DEBUG_INIT();
-	
-	cli_rx = (cli_rx_fpt)uart0_getc;
-	cli_tx = (cli_tx_fpt)uart0_putc;	 	
-	for(;;){
-		cli_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
-		cli_putstr(algo_name);
-		cli_putstr_P(PSTR(")\r\nloaded and running\r\n"));
-		cmd_interface(cmdlist);
+    main_setup();
+
+    for(;;){
+        welcome_msg(algo_name);
+        cmd_interface(cmdlist);
 	}
 }