X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=test_src%2Fmain-grain-test.c;h=585589c31110bf94405f474f211d74ad9d1856d1;hp=1cd10e182cec4012ae089511c7db80cc0a7b3220;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hpb=302f07c97444e2f5f5560dc2fd9af58d4b591d45

diff --git a/test_src/main-grain-test.c b/test_src/main-grain-test.c
index 1cd10e1..585589c 100644
--- a/test_src/main-grain-test.c
+++ b/test_src/main-grain-test.c
@@ -1,7 +1,7 @@
 /* main-grain-test.c */
 /*
     This file is part of the AVR-Crypto-Lib.
-    Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
+    Copyright (C) 2006-2015 Daniel Otte (bg@nerilex.org)
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,31 +21,25 @@
  * 
 */
 
-#include "config.h"
-
-#include "uart_i.h"
-#include "debug.h"
-#include "cli.h"
+#include "main-test-common.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>
-#include <stdint.h>
-#include <string.h>
-
-char* algo_name = "Grain";
+char *algo_name = "Grain";
 
 /*****************************************************************************
  *  additional validation-functions                                          *
  *****************************************************************************/
-void grain_genctx_dummy(uint8_t* key, uint16_t keysize_b, void* ctx){
+void grain_genctx_dummy(uint8_t *key, uint16_t keysize_b, void *ctx){
 	uint8_t iv[8]={0};
 	grain_init(key, &iv, ctx);
 }
 
-uint8_t grain_getbyte_dummy(grain_ctx_t* ctx){
+uint8_t grain_getbyte_dummy(grain_ctx_t *ctx){
 	uint8_t i,ret=0;
 	for(i=0; i<8; ++i){
 		ret<<=1;
@@ -54,7 +48,7 @@ uint8_t grain_getbyte_dummy(grain_ctx_t* ctx){
 	return ret;
 }
 
-uint8_t grain_getbyte_dummy_rev(grain_ctx_t* ctx){
+uint8_t grain_getbyte_dummy_rev(grain_ctx_t *ctx){
 	uint8_t i,ret=0;
 	for(i=0; i<8; ++i){
 		ret >>= 1;
@@ -64,15 +58,8 @@ 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_set_estream(1);
+	scal_nessie_run(&grain_desc);
 }
 
 
@@ -158,7 +145,7 @@ const char test_str[]        PROGMEM = "test";
 const char performance_str[] PROGMEM = "performance";
 const char echo_str[]        PROGMEM = "echo";
 
-cmdlist_entry_t cmdlist[] PROGMEM = {
+const cmdlist_entry_t cmdlist[] PROGMEM = {
 	{ nessie_str,      NULL, testrun_nessie_grain },
 	{ test_str,        NULL, testrun_std_grain},
 	{ performance_str, NULL, testrun_performance_grain},
@@ -167,14 +154,10 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 };
 
 int main (void){
-	DEBUG_INIT();
-	
-	cli_rx = (cli_rx_fpt)uart0_getc;
-	cli_tx = (cli_tx_fpt)uart0_putc;	 	
-	for(;;){
-		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);
+    main_setup();
+
+    for(;;){
+        welcome_msg(algo_name);
+        cmd_interface(cmdlist);
 	}
 }