X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-skein-test.c;h=7cd7c0d3246fd70dd0f9b0bc812916dee7261253;hb=2e0998249aeec3ce8509af80cc56fb6a49f3268d;hp=dc46b131b10a2dc3ad2152eb54d10c3b9fc1eaa4;hpb=7b5401ab9ce23a5da1de8b6c7de3a1aa20ac4cf8;p=avr-crypto-lib.git

diff --git a/test_src/main-skein-test.c b/test_src/main-skein-test.c
index dc46b13..7cd7c0d 100644
--- a/test_src/main-skein-test.c
+++ b/test_src/main-skein-test.c
@@ -21,31 +21,22 @@
  *
 */
 
-#include "config.h"
-
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "skein.h"
-#include "hfal/hfal_skein256.h"
-#include "hfal/hfal_skein512.h"
-#include "hfal/hfal_skein1024.h"
-#include "cli.h"
+#include "hfal_skein256.h"
+#include "hfal_skein512.h"
+#include "hfal_skein1024.h"
 #include "shavs.h"
 #include "nessie_hash_test.h"
 #include "performance_test.h"
-#include "hfal/hfal-performance.h"
-#include "hfal/hfal-nessie.h"
-#include "hfal/hfal-basic.h"
-
-
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
+#include "hfal-performance.h"
+#include "hfal-nessie.h"
+#include "hfal-basic.h"
 
-char* algo_name = "Skein";
+char *algo_name = "Skein";
 
-const hfdesc_t* algolist[] PROGMEM = {
+const hfdesc_t *const algolist[] PROGMEM = {
 	(hfdesc_t*)&skein256_128_desc,
 	(hfdesc_t*)&skein256_160_desc,
 	(hfdesc_t*)&skein256_224_desc,
@@ -190,7 +181,7 @@ void zeromsg_test_skein(uint16_t outsize_b){
 	cli_hexdump_block(hash, (outsize_b+7)/8, 4, 16);
 }
 
-void zeromsg_test_common(char* p){
+void zeromsg_test_common(char *p){
 	uint8_t i;
 	uint16_t s=0;
 	uint16_t sizes[]={128, 160, 224, 256, 384, 512, 1024};
@@ -259,7 +250,7 @@ const char shavs_test1_str[] PROGMEM = "shavs_test1";
 const char shavs_test2_str[] PROGMEM = "shavs_test2";
 const char shavs_test3_str[] PROGMEM = "shavs_test3";
 
-cmdlist_entry_t cmdlist[] PROGMEM = {
+const cmdlist_entry_t cmdlist[] PROGMEM = {
 	{ nessie_str,          NULL, testrun_nessie_skein            },
 	{ performance_str,     NULL, performance_skein               },
 	{ test_str,            NULL, testrun_stdtest_skein           },
@@ -275,21 +266,13 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 };
 
 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*)&skein256_256_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"));
 
+	for(;;){
+	    welcome_msg(algo_name);
 		cmd_interface(cmdlist);
 	}
 }