X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=test_src%2Fmain-shabea-test.c;h=5d6e633a3fea4e6beaf7c9177dbe5f47274a643d;hp=f221fd54af6b108b9eb005cb49f1f9e61cddf8e0;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hpb=2159c273c9d3361571a6ff1ab63d9bc76582fbab

diff --git a/test_src/main-shabea-test.c b/test_src/main-shabea-test.c
index f221fd5..5d6e633 100644
--- a/test_src/main-shabea-test.c
+++ b/test_src/main-shabea-test.c
@@ -1,7 +1,7 @@
 /* main-shabea-test.c */
 /*
-    This file is part of the Crypto-avr-lib/microcrypt-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
@@ -25,34 +25,27 @@
  * GPLv3 or later
  * 
  */
-#include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
-#include "debug.h"
+
+#include "main-test-common.h"
 
 #include "shabea.h"
 #include "nessie_bc_test.h"
-#include "cli.h"
 #include "performance_test.h"
 
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-
-char* cipher_name = "Shabea";
+char *algo_name = "Shabea";
 
 /*****************************************************************************
  *  additional validation-functions                                          *
  *****************************************************************************/
-void shabea_genctx_dummy(uint8_t* key, uint16_t keysize_b, void* ctx){
+void shabea_genctx_dummy(uint8_t *key, uint16_t keysize_b, void *ctx){
 	memcpy(ctx, key, (keysize_b+7)/8);
 }
 
-void shabea_enc_dummy(void* buffer, void* ctx){
+void shabea_enc_dummy(void *buffer, void *ctx){
 	shabea256(buffer, ctx, 256, 1, 16);
 }
 
-void shabea_dec_dummy(void* buffer, void* ctx){
+void shabea_dec_dummy(void *buffer, void *ctx){
 	shabea256(buffer, ctx, 256, 0, 16);
 }
 
@@ -60,7 +53,7 @@ void shabea_dec_dummy(void* buffer, void* ctx){
 void testrun_nessie_shabea(void){
 	nessie_bc_ctx.blocksize_B =  32;
 	nessie_bc_ctx.keysize_b   = 256;
-	nessie_bc_ctx.name        = cipher_name;
+	nessie_bc_ctx.name        = algo_name;
 	nessie_bc_ctx.ctx_size_B  = 32;
 	nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)shabea_enc_dummy;
 	nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)shabea_dec_dummy;
@@ -84,44 +77,44 @@ void testrun_performance_shabea(void){
 	startTimer(1);
 	shabea256(data, key, 256, 1, 16);
 	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);
 	
 	
 	startTimer(1);
 	shabea256(data, key, 256, 0, 16);
 	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tdecrypt time: "));
+	cli_putstr_P(PSTR("\r\n\tdecrypt 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"));
 }
 
 /*****************************************************************************
  *  self tests																 *
  *****************************************************************************/
 
-void testencrypt(uint8_t* block, uint8_t* key){
-	uart_putstr("\r\n==testy-encrypt==\r\n key: ");
-	uart_hexdump(key,16);
-	uart_putstr("\r\n plain: ");
-	uart_hexdump(block,32);
+void testencrypt(uint8_t *block, uint8_t *key){
+	cli_putstr("\r\n==testy-encrypt==\r\n key: ");
+	cli_hexdump(key,16);
+	cli_putstr("\r\n plain: ");
+	cli_hexdump(block,32);
 	shabea256(block,key,128,1,16);
-	uart_putstr("\r\n crypt: ");
-	uart_hexdump(block,32);
+	cli_putstr("\r\n crypt: ");
+	cli_hexdump(block,32);
 }
 
-void testdecrypt(uint8_t* block, uint8_t* key){
+void testdecrypt(uint8_t *block, uint8_t *key){
 
-	uart_putstr("\r\n==testy-decrypt==\r\n key: ");
-	uart_hexdump(key,16);
-	uart_putstr("\r\n crypt: ");
-	uart_hexdump(block,32);
+	cli_putstr("\r\n==testy-decrypt==\r\n key: ");
+	cli_hexdump(key,16);
+	cli_putstr("\r\n crypt: ");
+	cli_hexdump(block,32);
 	shabea256(block,key,128,0,16);
-	uart_putstr("\r\n plain: ");
-	uart_hexdump(block,32);
+	cli_putstr("\r\n plain: ");
+	cli_hexdump(block,32);
 }
 
 void testrun_shabea(void){
@@ -166,28 +159,24 @@ void testrun_shabea(void){
  *  main																	 *
  *****************************************************************************/
 
+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 cmdlist_entry_t cmdlist[] PROGMEM = {
+	{ nessie_str,      NULL, testrun_nessie_shabea},
+	{ test_str,        NULL, testrun_shabea},
+	{ performance_str, NULL, testrun_performance_shabea},
+	{ echo_str,    (void*)1, (void_fpt)echo_ctrl},
+	{ NULL,            NULL, NULL}
+};
+
 int main (void){
-	char str[20];
-
-	DEBUG_INIT();
-	uart_putstr("\r\n");
-
-	uart_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
-	uart_putstr(cipher_name);
-	uart_putstr_P(PSTR(")\r\nloaded and running\r\n"));
-
-	PGM_P    u   = PSTR("nessie\0test\0performance\0");
-	void_fpt v[] = {testrun_nessie_shabea, testrun_shabea, testrun_performance_shabea};
-
-	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");
+    main_setup();
+
+    for(;;){
+        welcome_msg(algo_name);
+        cmd_interface(cmdlist);
 	}
-	
 }
-