X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=test_src%2Fmain-omac-noekeon-test.c;h=c125a73cb8f1f433f2a05b29fbb376c2d81dccbf;hp=fc5b731ce5d0dc37061bc3866c0011c58121745a;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hpb=572b35bb7409fb362441e0812cb62eab9f2411f0

diff --git a/test_src/main-omac-noekeon-test.c b/test_src/main-omac-noekeon-test.c
index fc5b731..c125a73 100644
--- a/test_src/main-omac-noekeon-test.c
+++ b/test_src/main-omac-noekeon-test.c
@@ -1,7 +1,7 @@
 /* main-omac-noekeon-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,40 +21,32 @@
  * 
 */
 
-#include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "noekeon.h"
 #include "omac_noekeon.h"
 
-#include "cli.h"
 #include "nessie_mac_test.h"
 #include "performance_test.h"
 
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-
-char* algo_name = "OMAC-Noekeon";
+char *algo_name = "OMAC-Noekeon";
 
 /*****************************************************************************
  *  additional validation-functions											 *
  *****************************************************************************/
 
-void test_mac(void* key, void* data, uint16_t datalength_b){
+void test_mac(void *key, void *data, uint16_t datalength_b){
 	uint8_t mac[16];
-	uart_putstr_P(PSTR("\r\n-----------\r\n msg length (bit): 0x"));
-	uart_hexdump(((uint8_t*)&datalength_b)+1, 1);
-	uart_hexdump(((uint8_t*)&datalength_b)+0, 1);	
-	uart_putstr_P(PSTR("\r\n msg: "));
-	uart_hexdump(data, (datalength_b+7)/8);
-	uart_putstr_P(PSTR("\r\n key: "));
-	uart_hexdump(key, 16);
+	cli_putstr_P(PSTR("\r\n-----------\r\n msg length (bit): 0x"));
+	cli_hexdump(((uint8_t*)&datalength_b)+1, 1);
+	cli_hexdump(((uint8_t*)&datalength_b)+0, 1);	
+	cli_putstr_P(PSTR("\r\n msg: "));
+	cli_hexdump(data, (datalength_b+7)/8);
+	cli_putstr_P(PSTR("\r\n key: "));
+	cli_hexdump(key, 16);
 	omac_noekeon(mac, data, datalength_b, key, (uint8_t)-1);
-	uart_putstr_P(PSTR("\r\n mac: "));
-	uart_hexdump(mac, 16);
+	cli_putstr_P(PSTR("\r\n mac: "));
+	cli_hexdump(mac, 16);
 	
 }
 
@@ -72,25 +64,25 @@ void testrun_test_omac_noekeon(void){
 
 uint8_t stat_key[16];
 
-void omac_noekeon_next_dummy(void* buffer, void* ctx){
+void omac_noekeon_next_dummy(void *ctx, const void *buffer){
 	omac_noekeon_next(buffer, stat_key, ctx);
 }
 
-void omac_noekeon_init_dummy(void* key, uint16_t keysize_b, void* ctx){
+void omac_noekeon_init_dummy(void *ctx, const void *key, uint16_t keysize_b){
 	omac_noekeon_init(ctx);
 	memcpy(stat_key, key, 16);
 }
 
-void omac_noekeon_last_dummy(void* buffer, uint16_t size_b, void* key, uint16_t keysize_b, void* ctx){
+void omac_noekeon_last_dummy(void *ctx, const void *buffer, uint16_t size_b){
 	while(size_b>128){
-		omac_noekeon_next(buffer, key, ctx);
+		omac_noekeon_next(buffer, stat_key, ctx);
 		size_b -= 128;
 		buffer = (uint8_t*)buffer +16;
 	}
-	omac_noekeon_last(buffer, size_b, key, ctx);
+	omac_noekeon_last(buffer, size_b, stat_key, ctx);
 }
 
-void omac_noekeon_conv_dummy(void* buffer, void* ctx){
+void omac_noekeon_conv_dummy(void *buffer, void *ctx){
 	memcpy(buffer, ctx, 16);
 }
 
@@ -125,27 +117,27 @@ void testrun_performance_omac_noekeon(void){
 	startTimer(1);
 	omac_noekeon_init(&ctx);
 	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tctx-gen time: "));
+	cli_putstr_P(PSTR("\r\n\tctx-gen time: "));
 	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);
+	cli_putstr(str);
 	
 	
 	startTimer(1);
 	omac_noekeon_next(data, key, &ctx);
 	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tone-block time: "));
+	cli_putstr_P(PSTR("\r\n\tone-block time: "));
 	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);
+	cli_putstr(str);
 	
 	
 	startTimer(1);
 	omac_noekeon_last(data, 128, key, &ctx);
 	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tlast block time: "));
+	cli_putstr_P(PSTR("\r\n\tlast block 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"));
 }
 
 /*****************************************************************************
@@ -157,7 +149,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_omac_noekeon },
 	{ test_str,        NULL, testrun_test_omac_noekeon},
 	{ performance_str, NULL, testrun_performance_omac_noekeon},
@@ -166,14 +158,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);
 	}
 }