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=ba78a7861bf7a04ea7dce1a8b7d92860a2c26021;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hpb=572b35bb7409fb362441e0812cb62eab9f2411f0

diff --git a/test_src/main-shabea-test.c b/test_src/main-shabea-test.c
index ba78a78..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 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
@@ -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* algo_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);
 }
 
@@ -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){
@@ -171,7 +164,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_shabea},
 	{ test_str,        NULL, testrun_shabea},
 	{ performance_str, NULL, testrun_performance_shabea},
@@ -180,14 +173,10 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 };
 
 int main (void){
-	DEBUG_INIT();
-	uart_putstr("\r\n");
-	cli_rx = uart_getc;
-	cli_tx = uart_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"));
-		cmd_interface(cmdlist);
+    main_setup();
+
+    for(;;){
+        welcome_msg(algo_name);
+        cmd_interface(cmdlist);
 	}
 }