update to stream-cipher mkfiles

[arm-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 b52fd43df6d7e11b4d424634b40ef1a362af48c0..4b9fdff5a190ba24471def87c3e1220b21dd68a5 100644 (file)
--- a/test_src/main-skein-test.c
+++ b/test_src/main-skein-test.c
@@ -21,19 +21,12 @@
  *
 */
 
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include "config.h"
-#include "cli.h"
-#include "dump.h"
-#include "uart_lowlevel.h"
-#include "sysclock.h"
-#include "hw_gptm.h"
+#include "main-test-common.h"
 
 #include "shavs.h"
 #include "nessie_hash_test.h"
 #include "performance_test.h"
+#include "hfal-basic.h"
 #include "hfal-nessie.h"
 #include "hfal-performance.h"
 #include "hfal-test.h"
@@ -43,15 +36,6 @@
 #include "hfal_skein512.h"
 #include "hfal_skein1024.h"
 
-
-void uart0_putc(char byte){
-       uart_putc(UART_0, byte);
-}
-
-char uart0_getc(void){
-       return uart_getc(UART_0);
-}
-
 const char* algo_name = "Skein";
 
 const hfdesc_t* algolist[] = {
@@ -284,26 +268,13 @@ cmdlist_entry_t cmdlist[]  = {
 };
 
 int main(void) {
-       sysclk_set_freq(SYS_FREQ);
-       sysclk_mosc_verify_enable();
-    uart_init(UART_0, 115200, 8, UART_PARATY_NONE, UART_STOPBITS_ONE);
-    gptm_set_timer_32periodic(TIMER0);
-
-       cli_rx = uart0_getc;
-    cli_tx = uart0_putc;
-
+       main_setup();
        shavs_algolist=(hfdesc_t**)algolist;
        shavs_algo=(hfdesc_t*)&skein256_256_desc;
 
        for(;;){
-               cli_putstr("\r\n\r\nARM-Crypto-Lib VS (");
-               cli_putstr(algo_name);
-               cli_putstr("; ");
-               cli_putstr(__DATE__);
-               cli_putc(' ');
-               cli_putstr(__TIME__);
-               cli_putstr(")\r\nloaded and running\r\n");
-       cmd_interface(cmdlist);
+               welcome_msg(algo_name);
+               cmd_interface(cmdlist);
     }
 
 }