new OMAC (CMAC) with Noekeon; + some bug fixes for the nessie test-env

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

diff --git a/test_src/main-hmac-sha256-test.c b/test_src/main-hmac-sha256-test.c
index 819ed5726eeeae14e9a8495ee4a9a3d45f1d5bff..7b552374db8ad55816e6345276da50e15f3bdd24 100644 (file)
--- a/test_src/main-hmac-sha256-test.c
+++ b/test_src/main-hmac-sha256-test.c
@@ -29,6 +29,7 @@
 #include "sha256.h"
 #include "hmac-sha256.h"
 
+#include "cli.h"
 #include "nessie_mac_test.h"
 
 #include <stdint.h>
@@ -81,12 +82,14 @@ 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_hmacsha256, testrun_nessie_hmacsha256};
+
        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_hmacsha256();
-               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");