X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-sha1-test.c;h=68534431ffb5d0144bd1c2abf158baaa3b04782a;hb=83d0614d8b17eac97f891f7de2bb3ef265751dea;hp=e8ef85f7d54d6a069cdcc1b88723fd8bbeb367af;hpb=32e8c149a5d05724c3cf32a9ec9b795ac9e87be3;p=avr-crypto-lib.git

diff --git a/test_src/main-sha1-test.c b/test_src/main-sha1-test.c
index e8ef85f..6853443 100644
--- a/test_src/main-sha1-test.c
+++ b/test_src/main-sha1-test.c
@@ -34,6 +34,9 @@
 #include <string.h>
 #include <stdlib.h>
 #include "cli.h"
+#include "shavs.h"
+#include "hfal_sha1.h"
+#include "dump.h"
 
 char* algo_name = "SHA-1";
 
@@ -67,25 +70,25 @@ void testrun_nessie_sha1(void){
 
 void sha1_ctx_dump(sha1_ctx_t *s){
 	uint8_t i;
-	uart_putstr("\r\n==== sha1_ctx_dump ====");
+	cli_putstr("\r\n==== sha1_ctx_dump ====");
 	for(i=0;i<5;++i){
-		uart_putstr("\r\na["); uart_hexdump(&i, 1); uart_putstr("]: ");
-		uart_hexdump(&(s->h[i]), 4);
+		cli_putstr("\r\na["); cli_hexdump(&i, 1); cli_putstr("]: ");
+		cli_hexdump(&(s->h[i]), 4);
 	}
-	uart_putstr("\r\nlength"); uart_hexdump(&i, 8);
+	cli_putstr("\r\nlength"); cli_hexdump(&i, 8);
 } 
 
 void testrun_sha1(void){
 	sha1_hash_t hash;
 	sha1(&hash,"abc",3*8);
-	uart_putstr("\r\nsha1(\"abc\") = \r\n\t");
-	uart_hexdump(hash,SHA1_HASH_BITS/8);
+	cli_putstr("\r\nsha1(\"abc\") = \r\n\t");
+	cli_hexdump(hash,SHA1_HASH_BITS/8);
 	
 	sha1(&hash,"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",448);
-	uart_putstr("\r\nsha1(\"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq\") = \r\n\t");
-	uart_hexdump(hash,SHA1_HASH_BITS/8);
+	cli_putstr("\r\nsha1(\"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq\") = \r\n\t");
+	cli_hexdump(hash,SHA1_HASH_BITS/8);
 	
-	uart_putstr("\r\nsha1(1,000,000 * 'a') = \r\n\t");
+	cli_putstr("\r\nsha1(1,000,000 * 'a') = \r\n\t");
 	{
 		uint8_t block[SHA1_BLOCK_BITS/8];
 		uint16_t i;
@@ -98,10 +101,10 @@ void testrun_sha1(void){
 		sha1_lastBlock(&s,block,0);
 		sha1_ctx2hash(&hash, &s);
 	}
-	uart_hexdump(hash,SHA1_HASH_BITS/8);
+	cli_hexdump(hash,SHA1_HASH_BITS/8);
 	
 
-	uart_putstr("\r\nx");
+	cli_putstr("\r\nx");
 }
 
 
@@ -109,16 +112,16 @@ void testrun_sha1_2(void){
 	sha1_ctx_t ctx;
 	sha1_hash_t hash;
 	sha1(&hash,"",0);
-	uart_putstr("\r\nsha1(NULL) = \r\n\t");
-	uart_hexdump(hash,SHA1_HASH_BYTES);
+	cli_putstr("\r\nsha1(NULL) = \r\n\t");
+	cli_hexdump(hash,SHA1_HASH_BYTES);
 
 	memset(hash, 0, SHA1_HASH_BYTES);
 
 	sha1_init(&ctx);
 	sha1_lastBlock(&ctx, "", 0);
-	sha1_ctx2hash(hash, &ctx); 
-	uart_putstr("\r\nsha1(NULL) = \r\n\t");
-	uart_hexdump(hash,SHA1_HASH_BYTES);
+	sha1_ctx2hash(&hash, &ctx); 
+	cli_putstr("\r\nsha1(NULL) = \r\n\t");
+	cli_hexdump(hash,SHA1_HASH_BYTES);
 }
 
 
@@ -136,27 +139,27 @@ void testrun_performance_sha1(void){
 	startTimer(1);
 	sha1_init(&ctx);
 	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tctx-gen time: "));
+	cli_putstr_P(PSTR("\r\n\tctx-gen time: "));
 	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);
+	cli_putstr(str);
 	
 	
 	startTimer(1);
 	sha1_nextBlock(&ctx, data);
 	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tone-block time: "));
+	cli_putstr_P(PSTR("\r\n\tone-block time: "));
 	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);
+	cli_putstr(str);
 	
 	
 	startTimer(1);
 	sha1_lastBlock(&ctx, data, 0);
 	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tlast block time: "));
+	cli_putstr_P(PSTR("\r\n\tlast block time: "));
 	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);
+	cli_putstr(str);
 	
-	uart_putstr_P(PSTR("\r\n"));
+	cli_putstr_P(PSTR("\r\n"));
 }
 
 
@@ -169,25 +172,41 @@ const char test_str[]        PROGMEM = "test";
 const char test2_str[]       PROGMEM = "test2";
 const char performance_str[] PROGMEM = "performance";
 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 dump_str[]        PROGMEM = "dump";
+
 
 cmdlist_entry_t cmdlist[] PROGMEM = {
-	{ nessie_str,      NULL, testrun_nessie_sha1},
-	{ test_str,        NULL, testrun_sha1},
-	{ test2_str,       NULL, testrun_sha1_2},
-	{ performance_str, NULL, testrun_performance_sha1},
-	{ echo_str,    (void*)1, (void_fpt)echo_ctrl},
-	{ NULL,            NULL, NULL}
+	{ nessie_str,          NULL, testrun_nessie_sha1},
+	{ test_str,            NULL, testrun_sha1},
+	{ test2_str,           NULL, testrun_sha1_2},
+	{ performance_str,     NULL, testrun_performance_sha1},
+	{ echo_str,        (void*)1, (void_fpt)echo_ctrl},
+	{ shavs_list_str,      NULL, shavs_listalgos},
+	{ shavs_set_str,   (void*)1, (void_fpt)shavs_setalgo},
+	{ shavs_test1_str,     NULL, shavs_test1},
+	{ dump_str,        (void*)1, (void_fpt)dump},
+	{ NULL,                NULL, NULL}
+};
+
+const hfdesc_t* algolist[] PROGMEM = {
+	(hfdesc_t*)&sha1_desc,
+	NULL
 };
 
 int main (void){
 	DEBUG_INIT();
-	uart_putstr("\r\n");
+	
 	cli_rx = uart_getc;
-	cli_tx = uart_putc;	 	
+	cli_tx = uart_putc;	 
+	shavs_algolist=(hfdesc_t**)algolist;
+	shavs_algo=(hfdesc_t*)&sha1_desc;	
 	for(;;){
-		uart_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
-		uart_putstr(algo_name);
-		uart_putstr_P(PSTR(")\r\nloaded and running\r\n"));
+		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);
 	}
 }