X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=test_src%2Fmain-hmac-sha1-test.c;h=bdc733053b198c28c1c89c38dc994949b829c7ad;hp=865300f9836344c8ef3f5c4321c613127a9db181;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hpb=53f8a8d7ca5c03120224128e1f8552c99f6af11e

diff --git a/test_src/main-hmac-sha1-test.c b/test_src/main-hmac-sha1-test.c
index 865300f..bdc7330 100644
--- a/test_src/main-hmac-sha1-test.c
+++ b/test_src/main-hmac-sha1-test.c
@@ -1,7 +1,7 @@
 /* main-hmac-sha1-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,21 +21,14 @@
  * 
 */
 
-#include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "sha1.h"
 #include "hmac-sha1.h"
 
 #include "nessie_mac_test.h"
 
-#include <stdint.h>
-#include <string.h>
-#include "cli.h"
-
-char* algo_name = "HMAC-SHA1";
+char *algo_name = "HMAC-SHA1";
 
 /*****************************************************************************
  *  additional validation-functions											 *
@@ -65,7 +58,7 @@ const char test_str[]        PROGMEM = "test";
 /* 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_hmacsha1},
 	{ test_str,        NULL, testrun_nessie_hmacsha1},
 /*	{ performance_str, NULL, testrun_performance_hmacsha1}, */
@@ -74,14 +67,10 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 };
 
 int main (void){
-	DEBUG_INIT();
-	
-	cli_rx = uart_getc;
-	cli_tx = uart_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);
 	}
 }