X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-sha1-test.c;h=1dc476c4c0cc420d0de777fc58f615971015f397;hb=5c68d38237aa51b91a26309c24e8e38c7fbdffbe;hp=f4376dd549e7a09c193a855c2d9b793ac86f453c;hpb=d3db763eeb456ce00849ecf658782f95b9f5634c;p=avr-crypto-lib.git

diff --git a/test_src/main-sha1-test.c b/test_src/main-sha1-test.c
index f4376dd..1dc476c 100644
--- a/test_src/main-sha1-test.c
+++ b/test_src/main-sha1-test.c
@@ -43,13 +43,6 @@ char* algo_name = "SHA-1";
 /*****************************************************************************
  *  additional validation-functions											 *
  *****************************************************************************/
-void sha1_next_dummy(void* buffer, void* ctx){
-	sha1_nextBlock(ctx, buffer);
-}
-
-void sha1_last_dummy(void* buffer, uint16_t size_b, void* ctx){
-	sha1_lastBlock(ctx, buffer, size_b);
-}
 
 void testrun_nessie_sha1(void){
 	nessie_hash_ctx.hashsize_b  = 160;
@@ -57,8 +50,8 @@ void testrun_nessie_sha1(void){
 	nessie_hash_ctx.ctx_size_B  = sizeof(sha1_ctx_t);
 	nessie_hash_ctx.name = algo_name;
 	nessie_hash_ctx.hash_init = (nessie_hash_init_fpt)sha1_init;
-	nessie_hash_ctx.hash_next = (nessie_hash_next_fpt)sha1_next_dummy;
-	nessie_hash_ctx.hash_last = (nessie_hash_last_fpt)sha1_last_dummy;
+	nessie_hash_ctx.hash_next = (nessie_hash_next_fpt)sha1_nextBlock;
+	nessie_hash_ctx.hash_last = (nessie_hash_last_fpt)sha1_lastBlock;
 	nessie_hash_ctx.hash_conv = (nessie_hash_conv_fpt)sha1_ctx2hash;
 	
 	nessie_hash_run();
@@ -70,25 +63,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;
@@ -101,10 +94,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");
 }
 
 
@@ -112,16 +105,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);
+	cli_putstr("\r\nsha1(NULL) = \r\n\t");
+	cli_hexdump(hash,SHA1_HASH_BYTES);
 }
 
 
@@ -139,27 +132,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"));
 }
 
 
@@ -198,15 +191,15 @@ const hfdesc_t* algolist[] PROGMEM = {
 
 int main (void){
 	DEBUG_INIT();
-	uart_putstr("\r\n");
+	
 	cli_rx = uart_getc;
 	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);
 	}
 }