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=0d6110b8c7a6d8d18f09c553cb0b3fb3b935aeaa;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hpb=701cee0d98aab48dd3192c8cc7c77eb42581bc56

diff --git a/test_src/main-shacal2_enc-test.c b/test_src/main-shacal2_enc-test.c
index 0d6110b..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 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,30 +21,22 @@
  * 
 */
 
-#include "config.h"
-
-#include "uart_i.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* algo_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);
 }
 
@@ -97,14 +89,10 @@ const 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);
 	}
 }