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

diff --git a/test_src/main-salsa20-test.c b/test_src/main-salsa20-test.c
index 0332457..c9ddb83 100644
--- a/test_src/main-salsa20-test.c
+++ b/test_src/main-salsa20-test.c
@@ -1,7 +1,7 @@
 /* main-salsa20-test.c */
 /*
     This file is part of the AVR-Crypto-Lib.
-    Copyright (C) 2006-2011 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
@@ -18,24 +18,16 @@
 */
 
 
-#include "config.h"
-
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "salsa20.h"
-#include "cli.h"
 #include "performance_test.h"
 
 #include "scal_salsa20.h"
 #include "scal-basic.h"
 #include "scal-nessie.h"
 
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-
-char* algo_name = "Salsa20";
+char *algo_name = "Salsa20";
 
 /*****************************************************************************
  *  additional validation-functions											 *
@@ -51,10 +43,10 @@ void nessie_first(void){
 	cli_hexdump(key, 16);
 	salsa20_init(key, 128, NULL, &ctx);
 	cli_putstr_P(PSTR("\r\n internal state: "));
-	cli_hexdump_block(ctx.a, 64, 4, 16);
+	cli_hexdump_block(ctx.a.v8, 64, 4, 16);
 	salsa20_gen(&ctx);
 	cli_putstr_P(PSTR("\r\n internal state: "));
-	cli_hexdump_block(ctx.a, 64, 4, 16);
+	cli_hexdump_block(ctx.a.v8, 64, 4, 16);
 	cli_putstr_P(PSTR("\r\n data: "));
 	cli_hexdump_block(ctx.buffer, 64, 4, 16);
 
@@ -63,13 +55,13 @@ void nessie_first(void){
 	key[15] = 0x01;
 	cli_putstr_P(PSTR("\r\n testing with key: "));
 	cli_hexdump(key, 16);
-	cli_hexdump_block(ctx.a, 64, 4, 16);
+	cli_hexdump_block(ctx.a.v8, 64, 4, 16);
 	salsa20_init(key, 128, NULL, &ctx);
 	cli_putstr_P(PSTR("\r\n internal state: "));
-	cli_hexdump_block(ctx.a, 64, 4, 16);
+	cli_hexdump_block(ctx.a.v8, 64, 4, 16);
 	salsa20_gen(&ctx);
 	cli_putstr_P(PSTR("\r\n internal state: "));
-	cli_hexdump_block(ctx.a, 64, 4, 16);
+	cli_hexdump_block(ctx.a.v8, 64, 4, 16);
 	cli_putstr_P(PSTR("\r\n data: "));
 	cli_hexdump_block(ctx.buffer, 64, 4, 16);
 }
@@ -279,15 +271,11 @@ 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);
 	}
 }