nessie for the rest (skipjack seems broken, shabea req. more testing)

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

diff --git a/main-sha256-test.c b/main-sha256-test.c
index 4f8346f114db58671500662c6aa7f682e8ca4a25..552356c4a3c1ebfe8d5a4ab8ba089dd1b2e59390 100644 (file)
--- a/main-sha256-test.c
+++ b/main-sha256-test.c
@@ -31,6 +31,7 @@
 
 #include <stdint.h>
 #include <string.h>
+#include "cli.h"
 
 char* algo_name = "SHA-256";
 
@@ -73,16 +74,17 @@ int main (void){
        uart_putstr(algo_name);
        uart_putstr_P(PSTR(")\r\nloaded and running\r\n"));
 
-restart:
+       PGM_P    u   = PSTR("nessie\0test\0");
+       void_fpt v[] = {testrun_nessie_sha256, testrun_nessie_sha256};
+
        while(1){ 
-               if (!getnextwordn(str,20))  {DEBUG_S("DBG: W1\r\n"); goto error;}
-               if (strcmp(str, "nessie")) {DEBUG_S("DBG: 1b\r\n"); goto error;}
-                       testrun_nessie_sha256();
-               goto restart;           
+               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");
        }
-       
 }