X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=test_src%2Fmain-sha1-test.c;h=26bee126bdf9649277b4d3cb807cc95abbf5ee14;hp=c68c759d452dcb877e9e56b3f58b42652d2486a8;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hpb=c88d9d78db096516eb8aa2aff12c8db1f590738b

diff --git a/test_src/main-sha1-test.c b/test_src/main-sha1-test.c
index c68c759..26bee12 100644
--- a/test_src/main-sha1-test.c
+++ b/test_src/main-sha1-test.c
@@ -1,7 +1,7 @@
 /* main-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,27 +21,21 @@
  *
 */
 
-#include "config.h"
 
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "sha1.h"
 #include "nessie_hash_test.h"
 #include "hfal_sha1.h"
 #include "hfal-performance.h"
 
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include "cli.h"
 #include "shavs.h"
 #include "hfal_sha1.h"
 #include "dump.h"
 
-char* algo_name = "SHA-1";
+char *algo_name = "SHA-1";
 
-const hfdesc_t* algolist[] PROGMEM = {
+const hfdesc_t *const algolist[] PROGMEM = {
 	(hfdesc_t*)&sha1_desc,
 	NULL
 };
@@ -77,10 +71,10 @@ void sha1_ctx_dump(sha1_ctx_t *s){
 }
 
 void testrun_sha1(void){
-	sha1_hash_t hash;
+	uint8_t hash[20];
 	sha1(&hash,"abc",3*8);
 	cli_putstr_P(PSTR("\r\nsha1(\"abc\") = \r\n\t"));
-	cli_hexdump(hash,SHA1_HASH_BITS/8);
+	cli_hexdump(hash, SHA1_HASH_BITS/8);
 
 	sha1(&hash,"\0\0\0\0\0\0\0\0", 8*8);
 	cli_putstr_P(PSTR("\r\nsha1(8 x 0x00) = \r\n\t"));
@@ -126,7 +120,7 @@ void testrun_sha1(void){
 
 void testrun_sha1_2(void){
 	sha1_ctx_t ctx;
-	sha1_hash_t hash;
+	uint8_t hash[20];
 	sha1(&hash,"",0);
 	cli_putstr_P(PSTR("\r\nsha1(NULL) = \r\n\t"));
 	cli_hexdump(hash,SHA1_HASH_BYTES);
@@ -159,7 +153,7 @@ void testrun_sha1_506(void){
 		0x72, 0x22, 0x46, 0xb0, 0x14, 0xaf, 0x03, 0xef,
 		0x3b, 0xa3, 0x13, 0x64, 0xfc, 0x73, 0x2a, 0x4a,
 		0xb8, 0xf3, 0x85, 0x87 };
-	sha1_hash_t hash;
+	uint8_t hash[20];
 	sha1(&hash,data,506);
 	cli_putstr_P(PSTR("\r\nsha1(<tv506>) = \r\n\t"));
 	cli_hexdump(hash,SHA1_HASH_BYTES);
@@ -190,10 +184,11 @@ 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";
+const char shavs_test2_str[] PROGMEM = "shavs_test2";
 const char dump_str[]        PROGMEM = "dump";
 
 
-cmdlist_entry_t cmdlist[] PROGMEM = {
+const cmdlist_entry_t cmdlist[] PROGMEM = {
 	{ nessie_str,          NULL, testrun_nessie_sha1},
 	{ test_str,            NULL, testrun_sha1},
 	{ test2_str,           NULL, testrun_sha1_2},
@@ -203,21 +198,18 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 	{ shavs_list_str,      NULL, shavs_listalgos},
 	{ shavs_set_str,   (void*)1, (void_fpt)shavs_setalgo},
 	{ shavs_test1_str,     NULL, shavs_test1},
+	{ shavs_test2_str,     NULL, shavs_test2},
 	{ dump_str,        (void*)1, (void_fpt)dump},
 	{ 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*)&sha1_desc;
 	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);
+	    welcome_msg(algo_name);
+	    cmd_interface(cmdlist);
 	}
 }