X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=test_src%2Fmain-bmw-test.c;h=7046a553876066e7b141e3ee6cf1e3e561f76377;hp=efd48293cf80c403e4845843be75d012d265503d;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hpb=302f07c97444e2f5f5560dc2fd9af58d4b591d45

diff --git a/test_src/main-bmw-test.c b/test_src/main-bmw-test.c
index efd4829..7046a55 100644
--- a/test_src/main-bmw-test.c
+++ b/test_src/main-bmw-test.c
@@ -1,7 +1,7 @@
 /* main-bmw-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,30 +21,24 @@
  *
 */
 
-#include "config.h"
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "bmw_small.h"
 #include "bmw_large.h"
-#include "cli.h"
 #include "hfal_bmw_small.h"
 #include "hfal_bmw_large.h"
+
 #include "shavs.h"
 #include "nessie_hash_test.h"
-#include "performance_test.h"
 #include "hfal-nessie.h"
 #include "hfal-performance.h"
 #include "hfal-test.h"
+#include "performance_test.h"
 
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-
-char* algo_name = "BlueMidnightWish";
+char *algo_name = "BlueMidnightWish";
 
 
-const hfdesc_t* algolist[] PROGMEM = {
+const hfdesc_t *const algolist[] PROGMEM = {
 	(hfdesc_t*)&bmw224_desc,
 	(hfdesc_t*)&bmw256_desc,
 	(hfdesc_t*)&bmw384_desc,
@@ -64,18 +58,18 @@ void testrun_nessie_bmw(void){
 	hfal_nessie_multiple(algolist);
 }
 
-void bmw224_test(void* msg, uint32_t length_b){
+void bmw224_test(void *msg, uint32_t length_b){
 	hfal_test(&bmw224_desc, msg, length_b);
 }
 
-void bmw256_test(void* msg, uint32_t length_b){
+void bmw256_test(void *msg, uint32_t length_b){
 	hfal_test(&bmw256_desc, msg, length_b);
 }
-void bmw384_test(void* msg, uint32_t length_b){
+void bmw384_test(void *msg, uint32_t length_b){
 	hfal_test(&bmw384_desc, msg, length_b);
 }
 
-void bmw512_test(void* msg, uint32_t length_b){
+void bmw512_test(void *msg, uint32_t length_b){
 	hfal_test(&bmw512_desc, msg, length_b);
 }
 
@@ -108,8 +102,8 @@ void test507(void){
 }
 
 void testrun_stdtest_bmw(void){
-	char* msg0 = "abc";
-	char* msg1 = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq";
+	char *msg0 = "abc";
+	char *msg1 = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq";
 	bmw224_test(msg0, strlen(msg0)*8);
 	bmw224_test(msg1, strlen(msg1)*8);
 	bmw256_test(msg0, strlen(msg0)*8);
@@ -120,18 +114,18 @@ void testrun_stdtest_bmw(void){
 	bmw512_test(msg1, strlen(msg1)*8);
 }
 
-void bmw256_short_test(void* msg, uint32_t length_b){
+void bmw256_short_test(void *msg, uint32_t length_b){
 	bmw256_test("abc", 3*8);
 }
 
 
 void testshort(void){
-	char* msg0 = "abc";
+	char *msg0 = "abc";
 	bmw224_test(msg0, strlen(msg0)*8);
 }
 
 void testlshort(void){
-	char* msg0 = "abc";
+	char *msg0 = "abc";
 	bmw384_test(msg0, strlen(msg0)*8);
 }
 
@@ -154,38 +148,31 @@ const char echo_str[]        PROGMEM = "echo";
 const char shavs_list_str[]  PROGMEM = "shavs_list";
 const char shavs_set_str[]   PROGMEM = "shavs_set";
 const char shavs_test1_str[] PROGMEM = "shavs_test1";
-
-cmdlist_entry_t cmdlist[] PROGMEM = {
-	{ nessie_str,          NULL, testrun_nessie_bmw},
-	{ test_str,            NULL, testrun_stdtest_bmw},
-	{ testshort_str,       NULL, testshort},
-	{ testlshort_str,      NULL, testlshort},
-	{ test506_str,         NULL, test506},
-	{ test507_str,         NULL, test507},
-	{ performance_str,     NULL, performance_bmw},
-	{ shavs_list_str,      NULL, shavs_listalgos},
-	{ shavs_set_str,   (void*)1, (void_fpt)shavs_setalgo},
-	{ shavs_test1_str,     NULL, shavs_test1},
-	{ echo_str,        (void*)1, (void_fpt)echo_ctrl},
-	{ NULL,                NULL, NULL}
+const char shavs_test3_str[] PROGMEM = "shavs_test3";
+
+const cmdlist_entry_t cmdlist[] PROGMEM = {
+	{ nessie_str,                  NULL, testrun_nessie_bmw            },
+	{ test_str,                    NULL, testrun_stdtest_bmw           },
+	{ testshort_str,               NULL, testshort                     },
+	{ testlshort_str,              NULL, testlshort                    },
+	{ test506_str,                 NULL, test506                       },
+	{ test507_str,                 NULL, test507                       },
+	{ performance_str,             NULL, performance_bmw               },
+	{ shavs_list_str,              NULL, shavs_listalgos               },
+	{ shavs_set_str,           (void*)1, (void_fpt)shavs_setalgo       },
+	{ shavs_test1_str,             NULL, shavs_test1                   },
+	{ shavs_test3_str,             NULL, shavs_test3                   },
+	{ echo_str,                (void*)1, (void_fpt)echo_ctrl           },
+	{ NULL,                        NULL, NULL                          }
 };
 
 int main (void){
-	DEBUG_INIT();
+    main_setup();
 
-	cli_rx = (cli_rx_fpt)uart0_getc;
-	cli_tx = (cli_tx_fpt)uart0_putc;
-	shavs_algolist=(hfdesc_t**)algolist;
+    shavs_algolist=(hfdesc_t**)algolist;
 	shavs_algo=(hfdesc_t*)&bmw256_desc;
 	for(;;){
-		cli_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
-		cli_putstr(algo_name);
-		cli_putstr_P(PSTR("; "));
-		cli_putstr(__DATE__);
-		cli_putstr_P(PSTR(" "));
-		cli_putstr(__TIME__);
-		cli_putstr_P(PSTR(")\r\nloaded and running\r\n"));
-
+	    welcome_msg(algo_name);
 		cmd_interface(cmdlist);
 	}
 }