X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-seed-test.c;h=ca9dbb9703ccae11182a830060cf60f7c307fbea;hb=2e0998249aeec3ce8509af80cc56fb6a49f3268d;hp=39fe0a0edb6cd673823ba726ec52c9ac1c2fe127;hpb=d1181933dc28db92d787cf5604e2fc96ab0d8f9f;p=avr-crypto-lib.git

diff --git a/test_src/main-seed-test.c b/test_src/main-seed-test.c
index 39fe0a0..ca9dbb9 100644
--- a/test_src/main-seed-test.c
+++ b/test_src/main-seed-test.c
@@ -26,32 +26,26 @@
  * 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* 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);
@@ -131,7 +125,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_seed},
 	{ test_str,        NULL, testrun_seed},
 	{ performance_str, NULL, testrun_performance_seed},
@@ -140,14 +134,10 @@ 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);
 	}
 }