fixing E-Mail-Address & Copyright

[avr-crypto-lib.git] / test_src / main-twister-test.c

diff --git a/test_src/main-twister-test.c b/test_src/main-twister-test.c
index 794c05467055541cc63895238a8fc046a77a42b5..cdfa865d6b8c594e7334b0fdbd0a1eb1d6002f0c 100644 (file)
--- a/test_src/main-twister-test.c
+++ b/test_src/main-twister-test.c
@@ -1,7 +1,7 @@
 /* main-twister-test.c */
 /*
     This file is part of the AVR-Crypto-Lib.
-    Copyright (C) 2008, 2009  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,12 +21,11 @@
  * 
 */
 
-#include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
-#include "debug.h"
+
+#include "main-test-common.h"
 
 #include "twister-small.h"
+#include "twister-large.h"
 #include "nessie_hash_test.h"
 #include "performance_test.h"
 #include "hfal_twister224.h"
@@ -38,15 +37,9 @@
 #include "hfal-test.h"
 #include "shavs.h"
 
+char *algo_name = "TWISTER";
 
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include "cli.h"
-
-char* algo_name = "TWISTER";
-
-const hfdesc_t* algolist[] PROGMEM = {
+const hfdesc_t *const algolist[] PROGMEM = {
        (hfdesc_t*)&twister224_desc,
        (hfdesc_t*)&twister256_desc,
        (hfdesc_t*)&twister384_desc,
@@ -67,27 +60,27 @@ void testrun_nessie_twister(void){
  *
  *****************************************************************************/
 
-void test_twister224( void* msg, uint32_t length_b){
+void test_twister224( void *msg, uint32_t length_b){
        hfal_test(&twister224_desc, msg, length_b);
 }
 
-void test_twister256( void* msg, uint32_t length_b){
+void test_twister256( void *msg, uint32_t length_b){
        hfal_test(&twister256_desc, msg, length_b);
 }
 
-void test_twister384( void* msg, uint32_t length_b){
+void test_twister384( void *msg, uint32_t length_b){
        hfal_test(&twister384_desc, msg, length_b);
 }
 
-void test_twister512( void* msg, uint32_t length_b){
+void test_twister512( void *msg, uint32_t length_b){
        hfal_test(&twister512_desc, msg, length_b);
 }
 
 void testrun_twister(void){
-       const hfdesc_t* desc[4] = { &twister224_desc, &twister256_desc,
+       const hfdesc_t *desc[4] = { &twister224_desc, &twister256_desc,
                                    &twister384_desc, &twister512_desc };
        uint8_t i,j; 
-       char* testv[]={
+       char *testv[]={
                "", 
                "a", 
                "abc", 
@@ -126,7 +119,7 @@ const char shavs_list_str[]  PROGMEM = "shavs_list";
 const char shavs_set_str[]   PROGMEM = "shavs_set";
 const char shavs_test1_str[] PROGMEM = "shavs_test1";
 
-cmdlist_entry_t cmdlist[] PROGMEM = {
+const cmdlist_entry_t cmdlist[] PROGMEM = {
        { nessie_str,          NULL, testrun_nessie_twister},
        { test_str,            NULL, testrun_twister},
        { performance_str,     NULL, testrun_performance_twister},
@@ -138,16 +131,13 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 };
 
 int main (void){
-       DEBUG_INIT();
-       
-       cli_rx = uart_getc;
-       cli_tx = uart_putc;             
-       shavs_algolist=(hfdesc_t**)algolist;
+    main_setup();
+
+    shavs_algolist=(hfdesc_t**)algolist;
        shavs_algo=(hfdesc_t*)&twister256_desc;
+       
        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);
+           welcome_msg(algo_name);
+           cmd_interface(cmdlist);
        }
 }