X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=test_src%2Fmain-shacal2_enc-test.c;h=d7b614c87c4760eabaeb1427693ab4ea4bf4ceb6;hp=2925e71843d270d7ef0e1874b44a33dabaec7d15;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hpb=17332291e15183d71d88ed868275e3cb53917180

diff --git a/test_src/main-shacal2_enc-test.c b/test_src/main-shacal2_enc-test.c
index 2925e71..d7b614c 100644
--- a/test_src/main-shacal2_enc-test.c
+++ b/test_src/main-shacal2_enc-test.c
@@ -1,7 +1,7 @@
 /* main-shacal2_enc-test.c */
 /*
-    This file is part of the This file is part of the AVR-Crypto-Lib.
-    Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
+    This file is part of the AVR-Crypto-Lib.
+    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,37 +21,29 @@
  * 
 */
 
-#include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "shacal2_enc.h"
 #include "nessie_bc_test.h"
-#include "cli.h"
 #include "performance_test.h"
 
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-
-char* cipher_name = "Shacal2 encryption only";
+char *algo_name = "Shacal2 encryption only";
 
 /*****************************************************************************
  *  additional validation-functions											 *
  *****************************************************************************/
-void shacal2_genctx_dummy(uint8_t* key, uint16_t keysize_b, void* ctx){
+void shacal2_genctx_dummy(uint8_t *key, uint16_t keysize_b, void *ctx){
 	memcpy(ctx, key, (keysize_b+7)/8);
 }
 
-void shacal2_enc_dummy(void* buffer, void* ctx){
+void shacal2_enc_dummy(void *buffer, void *ctx){
 	shacal2_enc(buffer, ctx, SHACAL2_KEYSIZE);
 }
 
 void testrun_nessie_shacal2enc(void){
 	nessie_bc_ctx.blocksize_B = SHACAL2_BLOCKSIZE_B;
 	nessie_bc_ctx.keysize_b   = SHACAL2_KEYSIZE;
-	nessie_bc_ctx.name        = cipher_name;
+	nessie_bc_ctx.name        = algo_name;
 	nessie_bc_ctx.ctx_size_B  = SHACAL2_KEYSIZE_B;
 	nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)shacal2_enc_dummy;
 	nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)NULL;
@@ -76,35 +68,31 @@ void testrun_performance_shacal2enc(void){
 	t = stopTimer();
 	print_time_P(PSTR("\tencrypt time: "), t);
 	
-	uart_putstr_P(PSTR("\r\n"));
+	cli_putstr_P(PSTR("\r\n"));
 }
 
 /*****************************************************************************
  *  main																	 *
  *****************************************************************************/
 
-int main (void){
-	char  str[20];
-	DEBUG_INIT();
-	uart_putstr("\r\n");
+const char nessie_str[]      PROGMEM = "nessie";
+const char test_str[]        PROGMEM = "test";
+const char performance_str[] PROGMEM = "performance";
+const char echo_str[]        PROGMEM = "echo";
 
-	uart_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
-	uart_putstr(cipher_name);
-	uart_putstr_P(PSTR(")\r\nloaded and running\r\n"));
+const cmdlist_entry_t cmdlist[] PROGMEM = {
+	{ nessie_str,      NULL, testrun_nessie_shacal2enc},
+	{ test_str,        NULL, testrun_nessie_shacal2enc},
+	{ performance_str, NULL, testrun_performance_shacal2enc},
+	{ echo_str,    (void*)1, (void_fpt)echo_ctrl},
+	{ NULL,            NULL, NULL}
+};
 
-	PGM_P    u   = PSTR("nessie\0test\0performance\0");
-	void_fpt v[] = {testrun_nessie_shacal2enc, 
-		            testrun_nessie_shacal2enc,
-		            testrun_performance_shacal2enc};
+int main (void){
+    main_setup();
 
-	while(1){ 
-		if (!getnextwordn(str,20)){DEBUG_S("DBG: W1\r\n"); goto error;}
-		if(execcommand_d0_P(str, u, v)<0){
-			uart_putstr_P(PSTR("\r\nunknown command\r\n"));
-		}
-		continue;
-	error:
-		uart_putstr("ERROR\r\n");
+    for(;;){
+        welcome_msg(algo_name);
+        cmd_interface(cmdlist);
 	}
-	
 }