X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=test_src%2Fmain-keccak-test.c;h=9767ccc3c2f43bf9f35fcb88cc2346f5163f318f;hp=c277ce5c0a7fe8619c230e13f08542aa1fbf9b0f;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hpb=d1181933dc28db92d787cf5604e2fc96ab0d8f9f

diff --git a/test_src/main-keccak-test.c b/test_src/main-keccak-test.c
index c277ce5..9767ccc 100644
--- a/test_src/main-keccak-test.c
+++ b/test_src/main-keccak-test.c
@@ -1,7 +1,7 @@
 /* main-keccak-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,12 +21,9 @@
  *
 */
 
-#include "config.h"
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "keccak.h"
-#include "cli.h"
 #include "hfal_keccak.h"
 #include "shavs.h"
 #include "nessie_hash_test.h"
@@ -35,14 +32,10 @@
 #include "hfal-performance.h"
 #include "hfal-test.h"
 
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
+char *algo_name = "Keccak";
 
-char* algo_name = "Keccak";
 
-
-const hfdesc_t* algolist[] PROGMEM = {
+const hfdesc_t *const algolist[] PROGMEM = {
 	(hfdesc_t*)&keccak224_desc,
 	(hfdesc_t*)&keccak256_desc,
 	(hfdesc_t*)&keccak384_desc,
@@ -60,7 +53,7 @@ void test_256(void){
 	keccak_ctx_t ctx;
 	keccak256_init(&ctx);
 	keccak_nextBlock(&ctx, null);
-	//	keccak_lastBlock(&ctx, data, 29);
+	keccak_lastBlock(&ctx, null, 29);
 	keccak256_ctx2hash(hash, &ctx);
 	cli_putstr_P(PSTR("\r\n testhash: "));
 	cli_hexdump(hash, 32);
@@ -87,7 +80,7 @@ const char shavs_set_str[]   PROGMEM = "shavs_set";
 const char shavs_test1_str[] PROGMEM = "shavs_test1";
 const char shavs_test3_str[] PROGMEM = "shavs_test3";
 
-cmdlist_entry_t cmdlist[] PROGMEM = {
+const cmdlist_entry_t cmdlist[] PROGMEM = {
 	{ nessie_str,                NULL, testrun_nessie_keccak     },
 	{ performance_str,           NULL, performance_keccak        },
 	{ test256_str,               NULL, test_256                  },
@@ -99,22 +92,13 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 	{ NULL,                      NULL, NULL                      }
 };
 
-int main (void){
-	DEBUG_INIT();
+int main(void){
+    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*)&keccak256_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);
 	}
 }