backporting uart_i and cli

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

diff --git a/test_src/main-trivium-test.c b/test_src/main-trivium-test.c
index 4d4e3d2eb3deb081cadc81a909a9d3b04e0c3ff1..cbc3c7cd96ebcf68770e790be59c12e6810fca41 100644 (file)
--- a/test_src/main-trivium-test.c
+++ b/test_src/main-trivium-test.c
@@ -1,6 +1,6 @@
 /* main-trivium-test.c */
 /*
-    This file is part of the Crypto-avr-lib/microcrypt-lib.
+    This file is part of the AVR-Crypto-Lib.
     Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
@@ -23,7 +23,7 @@
 
 #include "config.h"
 #include "serial-tools.h"
-#include "uart.h"
+#include "uart_i.h"
 #include "debug.h"
 #include "cli.h"
 
@@ -35,7 +35,7 @@
 #include <stdint.h>
 #include <string.h>
 
-char* cipher_name = "Trivium";
+char* algo_name = "Trivium";
 
 /*****************************************************************************
  *  additional validation-functions                                                                                     *
@@ -58,7 +58,7 @@ void testrun_nessie_trivium(void){
        nessie_stream_ctx.outsize_b =   8; /* actually unused */
        nessie_stream_ctx.keysize_b =  80; /* this is the one we have refrence vectors for */
        nessie_stream_ctx.ivsize_b  =  32;
-       nessie_stream_ctx.name = cipher_name;
+       nessie_stream_ctx.name = algo_name;
        nessie_stream_ctx.ctx_size_B = sizeof(trivium_ctx_t);
        nessie_stream_ctx.cipher_genctx = (nessie_stream_genctx_fpt)trivium_genctx_dummy;
        nessie_stream_ctx.cipher_enc = (nessie_stream_genenc_fpt)trivium_getbyte_dummy;
@@ -81,43 +81,46 @@ void testrun_performance_trivium(void){
        startTimer(1);
        trivium_init(key, 80, iv, 80, &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);
        trivium_enc(&ctx);
        t = stopTimer();
-       uart_putstr_P(PSTR("\r\n\tencrypt time: "));
+       cli_putstr_P(PSTR("\r\n\tencrypt 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"));
 }
 
 /*****************************************************************************
  *  main                                                                                                                                        *
  *****************************************************************************/
 
-int main (void){
-       char  str[20];
-       DEBUG_INIT();
-       uart_putstr("\r\n");
+const char nessie_str[]      PROGMEM = "nessie";
+const char test_str[]        PROGMEM = "test";
+const char performance_str[] PROGMEM = "performance";
+const char echo_str[]        PROGMEM = "echo";
 
-       uart_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
-       uart_putstr(cipher_name);
-       uart_putstr_P(PSTR(")\r\nloaded and running\r\n"));
+cmdlist_entry_t cmdlist[] PROGMEM = {
+       { nessie_str,      NULL, testrun_nessie_trivium},
+       { test_str,        NULL, testrun_nessie_trivium},
+       { performance_str, NULL, testrun_performance_trivium},
+       { echo_str,    (void*)1, (void_fpt)echo_ctrl},
+       { NULL,            NULL, NULL}
+};
 
-       PGM_P    u   = PSTR("nessie\0test\0performance\0");
-       void_fpt v[] = {testrun_nessie_trivium, testrun_nessie_trivium, testrun_performance_trivium};
-
-       while(1){ 
-               if (!getnextwordn(str,20)){DEBUG_S("DBG: W1\r\n"); goto error;}
-               if(execcommand_d0_P(str, u, v)<0){
-                       uart_putstr_P(PSTR("\r\nunknown command\r\n"));
-               }
-               continue;
-       error:
-               uart_putstr("ERROR\r\n");
-       }       
+int main (void){
+       DEBUG_INIT();
+       
+       cli_rx = (cli_rx_fpt)uart0_getc;
+       cli_tx = (cli_tx_fpt)uart0_putc;                
+       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);
+       }
 }