X-Git-Url: https://git.cryptolib.org/avr-crypto-lib.git?a=blobdiff_plain;f=test_src%2Fmain-shabal-test.c;h=338733d6d3846e303ef04e76c056e9e8b4ae74ad;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hp=bcdc57aeef20e90b94527ff138a191221ce71868;hpb=9e69044519495dad3e2f76fc7795e72390b79a45;p=avr-crypto-lib.git

diff --git a/test_src/main-shabal-test.c b/test_src/main-shabal-test.c
index bcdc57a..338733d 100644
--- a/test_src/main-shabal-test.c
+++ b/test_src/main-shabal-test.c
@@ -1,7 +1,7 @@
 /* main-shabal-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,13 +21,10 @@
  *
 */
 
-#include "config.h"
 
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "shabal.h"
-#include "cli.h"
 #include "hfal_shabal.h"
 #include "hfal-test.h"
 #include "hfal-nessie.h"
@@ -36,14 +33,9 @@
 #include "nessie_hash_test.h"
 #include "performance_test.h"
 
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
+char *algo_name = "Shabal";
 
-char* algo_name = "Shabal";
-
-
-const hfdesc_t* algolist[] PROGMEM = {
+const hfdesc_t *const algolist[] PROGMEM = {
 	(hfdesc_t*)&shabal192_desc,
 	(hfdesc_t*)&shabal224_desc,
 	(hfdesc_t*)&shabal256_desc,
@@ -55,23 +47,23 @@ const hfdesc_t* algolist[] PROGMEM = {
 /*****************************************************************************
  *  additional validation-functions											 *
  *****************************************************************************/
-void testrun_stdtest_shabal192(void* msg, uint16_t size_b){
+void testrun_stdtest_shabal192(void *msg, uint16_t size_b){
 	hfal_test(&shabal192_desc, msg, size_b);
 }
 
-void testrun_stdtest_shabal224(void* msg, uint16_t size_b){
+void testrun_stdtest_shabal224(void *msg, uint16_t size_b){
 	hfal_test(&shabal224_desc, msg, size_b);
 }
 
-void testrun_stdtest_shabal256(void* msg, uint16_t size_b){
+void testrun_stdtest_shabal256(void *msg, uint16_t size_b){
 	hfal_test(&shabal256_desc, msg, size_b);
 }
 
-void testrun_stdtest_shabal384(void* msg, uint16_t size_b){
+void testrun_stdtest_shabal384(void *msg, uint16_t size_b){
 	hfal_test(&shabal384_desc, msg, size_b);
 }
 
-void testrun_stdtest_shabal512(void* msg, uint16_t size_b){
+void testrun_stdtest_shabal512(void *msg, uint16_t size_b){
 	hfal_test(&shabal512_desc, msg, size_b);
 }
 
@@ -102,9 +94,9 @@ void testshort(void){
 	testrun_stdtest_shabal192(ma, 64*8);
 }
 
-void shabal_ctx_dump(shabal_ctx_t* ctx){
+void shabal_ctx_dump(shabal_ctx_t *ctx){
 	uint8_t i;
-	void* p;
+	void *p;
 	cli_putstr_P(PSTR("\r\n=== shabal ctx dump ===\r\n  size = "));
 	i=sizeof(shabal_ctx_t);
 	if(i>=100)
@@ -203,7 +195,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_shabal          },
 	{ test_str,            NULL, testrun_stdtest_shabal         },
 	{ testinit192_str,     NULL, testinit_192                   },
@@ -220,21 +212,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*)&shabal256_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"));
-
-		cmd_interface(cmdlist);
+	    welcome_msg(algo_name);
+	    cmd_interface(cmdlist);
 	}
 }