X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=test_src%2Fmain-seed-test.c;h=31fef329dd7e511b6ba7c1e2483fe8103fa6d0ee;hp=b4c957c74d1a5b6dd97d9c971901e7b9491f60bb;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hpb=701cee0d98aab48dd3192c8cc7c77eb42581bc56

diff --git a/test_src/main-seed-test.c b/test_src/main-seed-test.c
index b4c957c..31fef32 100644
--- a/test_src/main-seed-test.c
+++ b/test_src/main-seed-test.c
@@ -1,7 +1,7 @@
 /* main-seed-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
@@ -19,39 +19,33 @@
 /**
  * \file	main-seed-test.c
  * \author	Daniel Otte
- * \email	daniel.otte@rub.de
+ * \email	bg@nerilex.org
  * \date	2007-06-01
  * \brief	test suit for SEED
  * \par License	
  * GPLv3 or later
  * 
  */
-#include "config.h"
 
-#include "uart_i.h"
-#include "debug.h"
+
+#include "main-test-common.h"
 
 #include "seed.h"
-#include "cli.h"
 #include "performance_test.h"
 #include "bcal-performance.h"
 #include "bcal-nessie.h"
 #include "bcal_seed.h"
 
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-
-char* algo_name = "Seed";
+char *algo_name = "Seed";
 
-const bcdesc_t* const algolist[] PROGMEM = {
+const bcdesc_t *const algolist[] PROGMEM = {
 	(bcdesc_t*)&seed_desc,
 	NULL
 };
 /*****************************************************************************
  *  additional validation-functions                                          *
  *****************************************************************************/
-void seed_genctx_dummy(uint8_t* key, uint16_t keysize, void* ctx){
+void seed_genctx_dummy(uint8_t *key, uint16_t keysize, void *ctx){
 	seed_init(key, ctx);
 }
 
@@ -68,7 +62,7 @@ void testrun_performance_seed(void){
  *  self tests                                                               *
  *****************************************************************************/
 
-void testencrypt(uint8_t* block, uint8_t* key){
+void testencrypt(uint8_t *block, uint8_t *key){
 	seed_ctx_t ctx;
 	cli_putstr("\r\n==testy-encrypt==\r\n key:   ");
 	cli_hexdump(key,16);
@@ -80,7 +74,7 @@ void testencrypt(uint8_t* block, uint8_t* key){
 	cli_hexdump(block,16);
 }
 
-void testdecrypt(uint8_t* block, uint8_t* key){
+void testdecrypt(uint8_t *block, uint8_t *key){
 	seed_ctx_t ctx;
 	cli_putstr("\r\n==testy-decrypt==\r\n key:   ");
 	cli_hexdump(key,16);
@@ -140,14 +134,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);
 	}
 }