X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-sha256-test.c;h=61ee2313e6666d048c0c4564fbca0e3eb56340c2;hb=4f50c75ee5a6cc88bf7ea71957ed509e298e6c25;hp=a4ba9f9cdca777ed0c80108f07708d2cad19ca0c;hpb=572b35bb7409fb362441e0812cb62eab9f2411f0;p=avr-crypto-lib.git

diff --git a/test_src/main-sha256-test.c b/test_src/main-sha256-test.c
index a4ba9f9..61ee231 100644
--- a/test_src/main-sha256-test.c
+++ b/test_src/main-sha256-test.c
@@ -23,79 +23,40 @@
 
 #include "config.h"
 #include "serial-tools.h"
-#include "uart.h"
+#include "uart_i.h"
 #include "debug.h"
 
 #include "sha256.h"
 #include "nessie_hash_test.h"
 #include "performance_test.h"
+#include "hfal-performance.h"
+#include "hfal-nessie.h"
 
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
 #include "cli.h"
+#include "shavs.h"
+#include "hfal_sha256.h"
+#include "dump.h"
 
 char* algo_name = "SHA-256";
 
+const hfdesc_t* algolist[] PROGMEM = {
+	(hfdesc_t*)&sha256_desc,
+	NULL
+};
+
 /*****************************************************************************
  *  additional validation-functions											 *
  *****************************************************************************/
-void sha256_next_dummy(void* buffer, void* ctx){
-	sha256_nextBlock(ctx, buffer);
-}
-
-void sha256_last_dummy(void* buffer, uint16_t size_b, void* ctx){
-	sha256_lastBlock(ctx, buffer, size_b);
-}
 
 void testrun_nessie_sha256(void){
-	nessie_hash_ctx.hashsize_b  = 256;
-	nessie_hash_ctx.blocksize_B = 512/8;
-	nessie_hash_ctx.ctx_size_B  = sizeof(sha256_ctx_t);
-	nessie_hash_ctx.name = algo_name;
-	nessie_hash_ctx.hash_init = (nessie_hash_init_fpt)sha256_init;
-	nessie_hash_ctx.hash_next = (nessie_hash_next_fpt)sha256_next_dummy;
-	nessie_hash_ctx.hash_last = (nessie_hash_last_fpt)sha256_last_dummy;
-	nessie_hash_ctx.hash_conv = (nessie_hash_conv_fpt)sha256_ctx2hash;
-	
-	nessie_hash_run();
+	hfal_nessie_multiple(algolist);
 }
 
 void testrun_performance_sha256(void){
-	uint64_t t;
-	char str[16];
-	uint8_t data[32];
-	sha256_ctx_t ctx;
-	
-	calibrateTimer();
-	print_overhead();
-	
-	memset(data, 0, 32);
-	
-	startTimer(1);
-	sha256_init(&ctx);
-	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tctx-gen time: "));
-	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);
-	
-	
-	startTimer(1);
-	sha256_nextBlock(&ctx, data);
-	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tone-block time: "));
-	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);
-	
-	
-	startTimer(1);
-	sha256_lastBlock(&ctx, data, 0);
-	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tlast block time: "));
-	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);
-	
-	uart_putstr_P(PSTR("\r\n"));
+	hfal_performance_multiple(algolist);
 }
 
 /*****************************************************************************
@@ -106,24 +67,34 @@ const char nessie_str[]      PROGMEM = "nessie";
 const char test_str[]        PROGMEM = "test";
 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_sha256},
-	{ test_str,        NULL, testrun_nessie_sha256},
-	{ performance_str, NULL, testrun_performance_sha256},
-	{ echo_str,    (void*)1, (void_fpt)echo_ctrl},
-	{ NULL,            NULL, NULL}
+	{ nessie_str,          NULL, testrun_nessie_sha256},
+	{ test_str,            NULL, testrun_nessie_sha256},
+	{ performance_str,     NULL, testrun_performance_sha256},
+	{ 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}
 };
 
 int main (void){
 	DEBUG_INIT();
-	uart_putstr("\r\n");
-	cli_rx = uart_getc;
-	cli_tx = uart_putc;	 	
+	
+	cli_rx = (cli_rx_fpt)uart0_getc;
+	cli_tx = (cli_tx_fpt)uart0_putc;	 	
+	shavs_algolist=(hfdesc_t**)algolist;
+	shavs_algo=(hfdesc_t*)&sha256_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);
 	}
 }