X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-grain-test.c;h=08931feb66d3715f8c1a7029057a18761cead6fe;hb=35dc9566e40c9f68fa216c70eaa6d5b0597448fe;hp=036faad94490a06930f813491e2da0f7a57eaaf1;hpb=572b35bb7409fb362441e0812cb62eab9f2411f0;p=avr-crypto-lib.git

diff --git a/test_src/main-grain-test.c b/test_src/main-grain-test.c
index 036faad..08931fe 100644
--- a/test_src/main-grain-test.c
+++ b/test_src/main-grain-test.c
@@ -22,13 +22,15 @@
 */
 
 #include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
+
+#include "uart_i.h"
 #include "debug.h"
 #include "cli.h"
 
 #include "grain.h"
-#include "nessie_stream_test.h"
+#include "scal_grain.h"
+#include "scal-basic.h"
+#include "scal-nessie.h"
 #include "performance_test.h"
 
 #include <stdlib.h>
@@ -64,15 +66,7 @@ uint8_t grain_getbyte_dummy_rev(grain_ctx_t* ctx){
 }
 
 void testrun_nessie_grain(void){
-	nessie_stream_ctx.outsize_b =   8; /* actually unused */
-	nessie_stream_ctx.keysize_b =  80; /* this is the one we have refrence vectors for */
-	nessie_stream_ctx.ivsize_b  =  64;
-	nessie_stream_ctx.name = algo_name;
-	nessie_stream_ctx.ctx_size_B = sizeof(grain_ctx_t);
-	nessie_stream_ctx.cipher_genctx = (nessie_stream_genctx_fpt)grain_genctx_dummy;
-	nessie_stream_ctx.cipher_enc = (nessie_stream_genenc_fpt)grain_getbyte_dummy_rev;
-	
-	nessie_stream_run();	
+	scal_nessie_run(&grain_desc);
 }
 
 
@@ -83,17 +77,17 @@ void testrun_std_grain(void){
 	/* 1 */
 	memset(key, 0, 10);
 	memset(iv, 0, 8);
-	uart_putstr_P(PSTR("\r\n=== std test ==="));
-	uart_putstr_P(PSTR("\r\n key: "));
-	uart_hexdump(key, 10);
-	uart_putstr_P(PSTR("\r\n iv:  "));
-	uart_hexdump(key, 8);
+	cli_putstr_P(PSTR("\r\n=== std test ==="));
+	cli_putstr_P(PSTR("\r\n key: "));
+	cli_hexdump(key, 10);
+	cli_putstr_P(PSTR("\r\n iv:  "));
+	cli_hexdump(key, 8);
 	grain_init(key, iv, &ctx);
 	for(i=0; i<10; ++i){
 		out[i] = grain_getbyte_dummy(&ctx);
 	}
-	uart_putstr_P(PSTR("\r\n out: "));
-	uart_hexdump(out, 10);
+	cli_putstr_P(PSTR("\r\n out: "));
+	cli_hexdump(out, 10);
 	
 	/* 2 */
 	for(i=0; i<8; ++i){
@@ -105,19 +99,19 @@ void testrun_std_grain(void){
 	for(i=0; i<8; ++i){
 		iv[i] = i*0x22+1;
 	}
-	uart_putstr_P(PSTR("\r\n\r\n key: "));
-	uart_hexdump(key, 10);
-	uart_putstr_P(PSTR("\r\n iv:  "));
-	uart_hexdump(key, 8);
+	cli_putstr_P(PSTR("\r\n\r\n key: "));
+	cli_hexdump(key, 10);
+	cli_putstr_P(PSTR("\r\n iv:  "));
+	cli_hexdump(key, 8);
 	grain_init(key, iv, &ctx);
 	for(i=0; i<10; ++i){
 		out[i] = grain_getbyte_dummy(&ctx);
 	}
-	uart_putstr_P(PSTR("\r\n out: "));
-	uart_hexdump(out, 10);
+	cli_putstr_P(PSTR("\r\n out: "));
+	cli_hexdump(out, 10);
 	
 	
-	uart_putstr_P(PSTR("\r\n\r\n"));
+	cli_putstr_P(PSTR("\r\n\r\n"));
 }
 
 void testrun_performance_grain(void){
@@ -135,18 +129,18 @@ void testrun_performance_grain(void){
 	startTimer(1);
 	grain_init(key, iv, &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);
 	grain_enc(&ctx);
 	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tencrypt time: "));
+	cli_putstr_P(PSTR("\r\n\tencrypt 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"));
 }
 
 /*****************************************************************************
@@ -168,13 +162,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);
 	}
 }