fixing and extending ecdsa

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

diff --git a/test_src/main-keccak-test.c b/test_src/main-keccak-test.c
index c277ce5c0a7fe8619c230e13f08542aa1fbf9b0f..501eb4b28e72234fafac0d94aa6698378f5c462b 100644 (file)
--- a/test_src/main-keccak-test.c
+++ b/test_src/main-keccak-test.c
@@ -21,12 +21,9 @@
  *
 */
 
-#include "config.h"
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "keccak.h"
-#include "cli.h"
 #include "hfal_keccak.h"
 #include "shavs.h"
 #include "nessie_hash_test.h"
@@ -35,14 +32,10 @@
 #include "hfal-performance.h"
 #include "hfal-test.h"
 
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-
 char* algo_name = "Keccak";
 
 
-const hfdesc_t* algolist[] PROGMEM = {
+const hfdesc_t* const algolist[] PROGMEM = {
        (hfdesc_t*)&keccak224_desc,
        (hfdesc_t*)&keccak256_desc,
        (hfdesc_t*)&keccak384_desc,
@@ -87,7 +80,7 @@ const char shavs_set_str[]   PROGMEM = "shavs_set";
 const char shavs_test1_str[] PROGMEM = "shavs_test1";
 const char shavs_test3_str[] PROGMEM = "shavs_test3";
 
-cmdlist_entry_t cmdlist[] PROGMEM = {
+const cmdlist_entry_t cmdlist[] PROGMEM = {
        { nessie_str,                NULL, testrun_nessie_keccak     },
        { performance_str,           NULL, performance_keccak        },
        { test256_str,               NULL, test_256                  },
@@ -100,21 +93,12 @@ 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*)&keccak256_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"));
-
-               cmd_interface(cmdlist);
+           welcome_msg(algo_name);
+           cmd_interface(cmdlist);
        }
 }