X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-sha1-test.c;h=ce10cd55152cfa9a9aa580d62f1e9fb30bf1d824;hb=83398013d7fefe3600b771be65317a330a140ffb;hp=311bb055b39f5c9a8f55d4c275ddd5c2fd19f23f;hpb=d32eba56ce10ea6b9eff123b50d9842673b38f2b;p=avr-crypto-lib.git

diff --git a/test_src/main-sha1-test.c b/test_src/main-sha1-test.c
index 311bb05..ce10cd5 100644
--- a/test_src/main-sha1-test.c
+++ b/test_src/main-sha1-test.c
@@ -18,7 +18,7 @@
 */
 /*
  * SHA-1 test-suit
- * 
+ *
 */
 
 #include "config.h"
@@ -58,7 +58,7 @@ void testrun_nessie_sha1(void){
 	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();
 }
 
@@ -74,18 +74,39 @@ void sha1_ctx_dump(sha1_ctx_t *s){
 		cli_hexdump(&(s->h[i]), 4);
 	}
 	cli_putstr("\r\nlength"); cli_hexdump(&i, 8);
-} 
+}
 
 void testrun_sha1(void){
 	sha1_hash_t hash;
 	sha1(&hash,"abc",3*8);
-	cli_putstr("\r\nsha1(\"abc\") = \r\n\t");
+	cli_putstr_P(PSTR("\r\nsha1(\"abc\") = \r\n\t"));
+	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"));
 	cli_hexdump(hash,SHA1_HASH_BITS/8);
-	
-	sha1(&hash,"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",448);
-	cli_putstr("\r\nsha1(\"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq\") = \r\n\t");
+/*
+   Len = 496
+   Msg = 46fe5ed326c8fe376fcc92dc9e2714e2240d3253b105ad
+         fbb256ff7a19bc40975c604ad7c0071c4fd78a7cb64786
+         e1bece548fa4833c04065fe593f6fb10
+   MD  = f220a7457f4588d639dc21407c942e9843f8e26b
+*/
+	sha1(&hash,"\x46\xfe\x5e\xd3\x26\xc8\xfe\x37"
+	           "\x6f\xcc\x92\xdc\x9e\x27\x14\xe2"
+	           "\x24\x0d\x32\x53\xb1\x05\xad\xfb"
+	           "\xb2\x56\xff\x7a\x19\xbc\x40\x97"
+	           "\x5c\x60\x4a\xd7\xc0\x07\x1c\x4f"
+	           "\xd7\x8a\x7c\xb6\x47\x86\xe1\xbe"
+	           "\xce\x54\x8f\xa4\x83\x3c\x04\x06"
+	           "\x5f\xe5\x93\xf6\xfb\x10", 496);
+	cli_putstr_P(PSTR("\r\nsha1(tv_496) = \r\n\t"));
 	cli_hexdump(hash,SHA1_HASH_BITS/8);
-	
+
+//	sha1(&hash,"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",448);
+	cli_putstr_P(PSTR("\r\nsha1(\"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq\") = \r\n\t"));
+	cli_hexdump(hash,SHA1_HASH_BITS/8);
+/*
 	cli_putstr("\r\nsha1(1,000,000 * 'a') = \r\n\t");
 	{
 		uint8_t block[SHA1_BLOCK_BITS/8];
@@ -93,14 +114,14 @@ void testrun_sha1(void){
 		sha1_ctx_t s;
 		memset(block,'a',SHA1_BLOCK_BITS/8);
 		sha1_init(&s);
-		for(i=0;i<15625; ++i){ /* (1000000/(SHA1_BLOCK_BITS/8)) */
+		for(i=0;i<15625; ++i){ / * (1000000/(SHA1_BLOCK_BITS/8)) * /
 			sha1_nextBlock(&s, block);
 		}
 		sha1_lastBlock(&s,block,0);
 		sha1_ctx2hash(&hash, &s);
 	}
 	cli_hexdump(hash,SHA1_HASH_BITS/8);
-	
+*/
 
 	cli_putstr("\r\nx");
 }
@@ -110,15 +131,15 @@ void testrun_sha1_2(void){
 	sha1_ctx_t ctx;
 	sha1_hash_t hash;
 	sha1(&hash,"",0);
-	cli_putstr("\r\nsha1(NULL) = \r\n\t");
+	cli_putstr_P(PSTR("\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); 
-	cli_putstr("\r\nsha1(NULL) = \r\n\t");
+	sha1_ctx2hash(&hash, &ctx);
+	cli_putstr_P(PSTR("\r\nsha1(NULL) = \r\n\t"));
 	cli_hexdump(hash,SHA1_HASH_BYTES);
 }
 
@@ -158,11 +179,11 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 
 int main (void){
 	DEBUG_INIT();
-	
+
 	cli_rx = (cli_rx_fpt)uart0_getc;
-	cli_tx = (cli_tx_fpt)uart0_putc;	 
+	cli_tx = (cli_tx_fpt)uart0_putc;
 	shavs_algolist=(hfdesc_t**)algolist;
-	shavs_algo=(hfdesc_t*)&sha1_desc;	
+	shavs_algo=(hfdesc_t*)&sha1_desc;
 	for(;;){
 		cli_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
 		cli_putstr(algo_name);