skipjack testvectors seem broken

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

diff --git a/main-xtea-test.c b/main-xtea-test.c
index 5e4ef0731a42b2e3a21bf42341257d12771424b1..07fcffeb1eb5a2f9ad1664d922704a5a34408f1c 100644 (file)
--- a/main-xtea-test.c
+++ b/main-xtea-test.c
@@ -1,3 +1,21 @@
+/* main-xtea-test.c */
+/*
+    This file is part of the Crypto-avr-lib/microcrypt-lib.
+    Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
 /*
  * XTEA test-suit
  * 
@@ -10,6 +28,8 @@
 
 #include "xtea.h"
 #include "nessie_bc_test.h"
+#include "performance_test.h"
+#include "cli.h"
 
 #include <stdint.h>
 #include <string.h>
@@ -40,7 +60,28 @@ void testrun_nessie_xtea(void){
        nessie_bc_run();        
 }
 
-
+void testrun_performance_xtea(void){
+       uint64_t t;
+       uint8_t key[16], data[8];
+       
+       calibrateTimer();
+       print_overhead();
+       
+       memset(key,  0, 16);
+       memset(data, 0,  8);
+       
+       startTimer(1);
+       xtea_enc(data, data, key);
+       t = stopTimer();
+       print_time_P(PSTR("\tencrypt time: "), t);
+       
+       startTimer(1);
+       xtea_dec(data, data, key);
+       t = stopTimer();
+       print_time_P(PSTR("\tdecrypt time: "), t);
+       
+       uart_putstr_P(PSTR("\r\n"));
+}
 
 /*****************************************************************************
  *  main                                                                                                                                        *
@@ -55,14 +96,16 @@ int main (void){
        uart_putstr(cipher_name);
        uart_putstr_P(PSTR(")\r\nloaded and running\r\n"));
 
-restart:
+       PGM_P    u   = PSTR("nessie\0test\0performance\0");
+       void_fpt v[] = {testrun_nessie_xtea, testrun_nessie_xtea, testrun_performance_xtea};
+
        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_xtea();
-               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");
-       }       
+       }
 }