some files were not adapted in the previous commit

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

diff --git a/test_src/main-skein-test.c b/test_src/main-skein-test.c
index dc46b131b10a2dc3ad2152eb54d10c3b9fc1eaa4..e38bf878cf54f4678185a45c9262f20599519906 100644 (file)
--- a/test_src/main-skein-test.c
+++ b/test_src/main-skein-test.c
@@ -21,31 +21,22 @@
  *
 */
 
-#include "config.h"
-
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "skein.h"
-#include "hfal/hfal_skein256.h"
-#include "hfal/hfal_skein512.h"
-#include "hfal/hfal_skein1024.h"
-#include "cli.h"
+#include "hfal_skein256.h"
+#include "hfal_skein512.h"
+#include "hfal_skein1024.h"
 #include "shavs.h"
 #include "nessie_hash_test.h"
 #include "performance_test.h"
-#include "hfal/hfal-performance.h"
-#include "hfal/hfal-nessie.h"
-#include "hfal/hfal-basic.h"
-
-
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
+#include "hfal-performance.h"
+#include "hfal-nessie.h"
+#include "hfal-basic.h"
 
 char* algo_name = "Skein";
 
-const hfdesc_t* algolist[] PROGMEM = {
+const hfdesc_t* const algolist[] PROGMEM = {
        (hfdesc_t*)&skein256_128_desc,
        (hfdesc_t*)&skein256_160_desc,
        (hfdesc_t*)&skein256_224_desc,
@@ -259,7 +250,7 @@ const char shavs_test1_str[] PROGMEM = "shavs_test1";
 const char shavs_test2_str[] PROGMEM = "shavs_test2";
 const char shavs_test3_str[] PROGMEM = "shavs_test3";
 
-cmdlist_entry_t cmdlist[] PROGMEM = {
+const cmdlist_entry_t cmdlist[] PROGMEM = {
        { nessie_str,          NULL, testrun_nessie_skein            },
        { performance_str,     NULL, performance_skein               },
        { test_str,            NULL, testrun_stdtest_skein           },
@@ -275,21 +266,13 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 };
 
 int main (void){
-       DEBUG_INIT();
+    main_setup();
 
-       cli_rx = (cli_rx_fpt)uart0_getc;
-       cli_tx = (cli_tx_fpt)uart0_putc;
-       shavs_algolist=(hfdesc_t**)algolist;
+    shavs_algolist=(hfdesc_t**)algolist;
        shavs_algo=(hfdesc_t*)&skein256_256_desc;
-       for(;;){
-               cli_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
-               cli_putstr(algo_name);
-               cli_putstr_P(PSTR("; "));
-               cli_putstr(__DATE__);
-               cli_putstr_P(PSTR(" "));
-               cli_putstr(__TIME__);
-               cli_putstr_P(PSTR(")\r\nloaded and running\r\n"));
 
+       for(;;){
+           welcome_msg(algo_name);
                cmd_interface(cmdlist);
        }
 }