X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-seed-test.c;h=39fe0a0edb6cd673823ba726ec52c9ac1c2fe127;hb=35dc9566e40c9f68fa216c70eaa6d5b0597448fe;hp=8d264dccfef79d8ab5fdbb87ed2036ac7c16753b;hpb=572b35bb7409fb362441e0812cb62eab9f2411f0;p=avr-crypto-lib.git

diff --git a/test_src/main-seed-test.c b/test_src/main-seed-test.c
index 8d264dc..39fe0a0 100644
--- a/test_src/main-seed-test.c
+++ b/test_src/main-seed-test.c
@@ -27,14 +27,16 @@
  * 
  */
 #include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
+
+#include "uart_i.h"
 #include "debug.h"
 
 #include "seed.h"
-#include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
+#include "bcal-performance.h"
+#include "bcal-nessie.h"
+#include "bcal_seed.h"
 
 #include <stdint.h>
 #include <string.h>
@@ -42,6 +44,10 @@
 
 char* algo_name = "Seed";
 
+const bcdesc_t* algolist[] PROGMEM = {
+	(bcdesc_t*)&seed_desc,
+	NULL
+};
 /*****************************************************************************
  *  additional validation-functions                                          *
  *****************************************************************************/
@@ -50,55 +56,12 @@ void seed_genctx_dummy(uint8_t* key, uint16_t keysize, void* ctx){
 }
 
 void testrun_nessie_seed(void){
-	nessie_bc_ctx.blocksize_B =  16;
-	nessie_bc_ctx.keysize_b   = 128;
-	nessie_bc_ctx.name        = algo_name;
-	nessie_bc_ctx.ctx_size_B  = sizeof(seed_ctx_t);
-	nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)seed_enc;
-	nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)seed_dec;
-	nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)seed_genctx_dummy;
-	
-	nessie_bc_run();
-	
+	bcal_nessie_multiple(algolist);
 }
 
 
 void testrun_performance_seed(void){
-	uint64_t t;
-	char str[16];
-	uint8_t key[16], data[16];
-	seed_ctx_t ctx;
-	
-	calibrateTimer();
-	print_overhead();
-	
-	memset(key,  0, 16);
-	memset(data, 0, 16);
-	
-	startTimer(1);
-	seed_init(key, &ctx);
-	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tctx-gen time: "));
-	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);
-	
-	
-	startTimer(1);
-	seed_enc(data, &ctx);
-	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tencrypt time: "));
-	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);
-	
-	
-	startTimer(1);
-	seed_dec(data, &ctx);
-	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tdecrypt time: "));
-	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);
-	
-	uart_putstr_P(PSTR("\r\n"));
+	bcal_performance_multiple(algolist);
 }
 
 /*****************************************************************************
@@ -107,26 +70,26 @@ void testrun_performance_seed(void){
 
 void testencrypt(uint8_t* block, uint8_t* key){
 	seed_ctx_t ctx;
-	uart_putstr("\r\n==testy-encrypt==\r\n key:   ");
-	uart_hexdump(key,16);
+	cli_putstr("\r\n==testy-encrypt==\r\n key:   ");
+	cli_hexdump(key,16);
 	seed_init(key, &ctx);
-	uart_putstr("\r\n plain: ");
-	uart_hexdump(block,16);
+	cli_putstr("\r\n plain: ");
+	cli_hexdump(block,16);
 	seed_enc(block, &ctx);
-	uart_putstr("\r\n crypt: ");
-	uart_hexdump(block,16);
+	cli_putstr("\r\n crypt: ");
+	cli_hexdump(block,16);
 }
 
 void testdecrypt(uint8_t* block, uint8_t* key){
 	seed_ctx_t ctx;
-	uart_putstr("\r\n==testy-decrypt==\r\n key:   ");
-	uart_hexdump(key,16);
+	cli_putstr("\r\n==testy-decrypt==\r\n key:   ");
+	cli_hexdump(key,16);
 	seed_init(key, &ctx);
-	uart_putstr("\r\n crypt: ");
-	uart_hexdump(block,16);
+	cli_putstr("\r\n crypt: ");
+	cli_hexdump(block,16);
 	seed_dec(block, &ctx);
-	uart_putstr("\r\n plain: ");
-	uart_hexdump(block,16);
+	cli_putstr("\r\n plain: ");
+	cli_hexdump(block,16);
 }
 
 void testrun_seed(void){
@@ -178,13 +141,13 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 
 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;	 	
 	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);
 	}
 }