]> git.cryptolib.org Git - avr-crypto-lib.git/blobdiff - test_src/main-noekeon-test.c
clean up
[avr-crypto-lib.git] / test_src / main-noekeon-test.c
index bfb42857cfbb155fd51be455811c7e9f7dbb2ae4..f19a91ca0ad0fd7d39ff19c6997e624c33b6c9bf 100644 (file)
@@ -1,6 +1,6 @@
 /* main-noekeon-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
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 /*
- * serpent test-suit
+ * noekeon test-suit
  * 
 */
 
 #include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
+
+#include "uart_i.h"
 #include "debug.h"
 
-#include <noekeon.h>
+#include <noekeon/noekeon.h>
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
+#include "bcal/bcal-performance.h"
+#include "bcal/bcal_noekeon.h"
 
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
 
-char* cipher_name = "Noekeon";
+char* algo_name = "Noekeon";
 
+const bcdesc_t* algolist[] PROGMEM = {
+       (bcdesc_t*)&noekeon_direct_desc,
+       (bcdesc_t*)&noekeon_indirect_desc,
+       NULL
+};
 /*****************************************************************************
  *  additional validation-functions                                                                                     *
  *****************************************************************************/
@@ -45,8 +52,8 @@ void noekeon_genctx_dummy(uint8_t* key, uint16_t keysize, void* ctx){
 }
 
 void testrun_nessie_noekeon_indirect(void){
-       char str[strlen(cipher_name)+10];
-       strcpy(str, cipher_name);
+       char str[strlen(algo_name)+10];
+       strcpy(str, algo_name);
        strcat(str, "-indirect");
        
        nessie_bc_ctx.blocksize_B =  16;
@@ -65,8 +72,8 @@ void noekeon_genctx_dummy_direct(uint8_t* key, uint16_t keysize, void* ctx){
 }
 
 void testrun_nessie_noekeon_direct(void){
-       char str[strlen(cipher_name)+10];
-       strcpy(str, cipher_name);
+       char str[strlen(algo_name)+10];
+       strcpy(str, algo_name);
        strcat(str, "-Direct");
        
        nessie_bc_ctx.blocksize_B =  16;
@@ -87,42 +94,42 @@ void testrun_nessie_noekeon(void){
 
 
 void testrun_stdtest_rundirect(void* data, void* key){
-       uart_putstr_P(PSTR("\r\n                     "));
-       uart_putstr_P(PSTR("k = "));
-       uart_hexdump(key,16);
+       cli_putstr_P(PSTR("\r\n                     "));
+       cli_putstr_P(PSTR("k = "));
+       cli_hexdump(key,16);
        
-       uart_putstr_P(PSTR("\r\n                     "));
-       uart_putstr_P(PSTR("a = "));
-       uart_hexdump(data,16);
+       cli_putstr_P(PSTR("\r\n                     "));
+       cli_putstr_P(PSTR("a = "));
+       cli_hexdump(data,16);
        
        noekeon_enc(data, key);
-       uart_putstr_P(PSTR("\r\nafter NESSIEencrypt, b = "));
-       uart_hexdump(data,16);
+       cli_putstr_P(PSTR("\r\nafter NESSIEencrypt, b = "));
+       cli_hexdump(data,16);
        
        noekeon_dec(data, key);
-       uart_putstr_P(PSTR("\r\nafter NESSIEdecrypt, a?= "));
-       uart_hexdump(data,16);
-       uart_putstr_P(PSTR("\r\n"));
+       cli_putstr_P(PSTR("\r\nafter NESSIEdecrypt, a?= "));
+       cli_hexdump(data,16);
+       cli_putstr_P(PSTR("\r\n"));
 }
 
 void testrun_stdtest_runindirect(void* data, void* key){
        noekeon_ctx_t ctx;
-       uart_putstr_P(PSTR("\r\n                     "));
-       uart_putstr_P(PSTR("k = "));
-       uart_hexdump(key,16);
+       cli_putstr_P(PSTR("\r\n                     "));
+       cli_putstr_P(PSTR("k = "));
+       cli_hexdump(key,16);
        
-       uart_putstr_P(PSTR("\r\n                     "));
-       uart_putstr_P(PSTR("a = "));
-       uart_hexdump(data,16);
+       cli_putstr_P(PSTR("\r\n                     "));
+       cli_putstr_P(PSTR("a = "));
+       cli_hexdump(data,16);
        noekeon_init(key, &ctx);
        noekeon_enc(data, &ctx);
-       uart_putstr_P(PSTR("\r\nafter NESSIEencrypt, b = "));
-       uart_hexdump(data,16);
+       cli_putstr_P(PSTR("\r\nafter NESSIEencrypt, b = "));
+       cli_hexdump(data,16);
        
        noekeon_dec(data, &ctx);
-       uart_putstr_P(PSTR("\r\nafter NESSIEdecrypt, a?= "));
-       uart_hexdump(data,16);
-       uart_putstr_P(PSTR("\r\n"));
+       cli_putstr_P(PSTR("\r\nafter NESSIEdecrypt, a?= "));
+       cli_hexdump(data,16);
+       cli_putstr_P(PSTR("\r\n"));
 }
 
 void testrun_stdtest_noekeon(void){
@@ -130,7 +137,7 @@ void testrun_stdtest_noekeon(void){
        uint8_t key3[16];
        noekeon_ctx_t ctx;
        
-       uart_putstr_P(PSTR("\r\nTest vectors for block cipher Noekeon in Indirect-Key Mode:\r\n"));
+       cli_putstr_P(PSTR("\r\nTest vectors for block cipher Noekeon in Indirect-Key Mode:\r\n"));
        
        memset(key,  0, 16);
        memset(data, 0, 16);
@@ -151,7 +158,7 @@ void testrun_stdtest_noekeon(void){
        noekeon_enc(data, &ctx);
        testrun_stdtest_runindirect(data, key3);
        
-       uart_putstr_P(PSTR("\r\nTest vectors for block cipher Noekeon in Direct-Key Mode:\r\n"));
+       cli_putstr_P(PSTR("\r\nTest vectors for block cipher Noekeon in Direct-Key Mode:\r\n"));
        
        memset(key,  0, 16);
        memset(data, 0, 16);
@@ -173,69 +180,38 @@ void testrun_stdtest_noekeon(void){
 }
 
 void testrun_performance_noekeon(void){
-       uint64_t t;
-       char str[16];
-       uint8_t key[16], data[16];
-       noekeon_ctx_t ctx;
-       
-       calibrateTimer();
-       print_overhead();
-       
-       memset(key,  0, 16);
-       memset(data, 0, 16);
-       
-       startTimer(1);
-       noekeon_init(key, &ctx);
-       t = stopTimer();
-       uart_putstr_P(PSTR("\r\n\tctx-gen time: "));
-       ultoa((unsigned long)t, str, 10);
-       uart_putstr(str);       
-       
-       startTimer(1);
-       noekeon_enc(data, &ctx);
-       t = stopTimer();
-       uart_putstr_P(PSTR("\r\n\tencrypt time: "));
-       ultoa((unsigned long)t, str, 10);
-       uart_putstr(str);       
-       
-       startTimer(1);
-       noekeon_dec(data, &ctx);
-       t = stopTimer();
-       uart_putstr_P(PSTR("\r\n\tdecrypt time: "));
-       ultoa((unsigned long)t, str, 10);
-       uart_putstr(str);
-       
-       uart_putstr_P(PSTR("\r\n"));
+       bcal_performance_multiple(algolist);
 }
 /*****************************************************************************
  *  main                                                                                                                                        *
  *****************************************************************************/
 
+const char nessie_str[]      PROGMEM = "nessie";
+const char test_str[]        PROGMEM = "test";
+const char direct_str[]      PROGMEM = "direct";
+const char indirect_str[]    PROGMEM = "indirect";
+const char performance_str[] PROGMEM = "performance";
+const char echo_str[]        PROGMEM = "echo";
+
+cmdlist_entry_t cmdlist[] PROGMEM = {
+       { nessie_str,      NULL, testrun_nessie_noekeon},
+       { test_str,        NULL, testrun_stdtest_noekeon},
+       { direct_str,      NULL, testrun_nessie_noekeon_direct},
+       { indirect_str,    NULL, testrun_nessie_noekeon_indirect},
+       { performance_str, NULL, testrun_performance_noekeon},
+       { echo_str,    (void*)1, (void_fpt)echo_ctrl},
+       { NULL,            NULL, NULL}
+};
+
 int main (void){
-       char  str[20];
        DEBUG_INIT();
-       uart_putstr("\r\n");
-
-       uart_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
-       uart_putstr(cipher_name);
-       uart_putstr_P(PSTR(")\r\nloaded and running\r\n"));
-
-       PGM_P    u   = PSTR("nessie\0test\0direct\0indirect\0performance\0");
-       void_fpt v[] = {testrun_nessie_noekeon, 
-                           testrun_stdtest_noekeon,
-                           testrun_nessie_noekeon_direct, 
-                           testrun_nessie_noekeon_indirect,  
-                           testrun_performance_noekeon};
-
-       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");
-       }
        
+       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);
+       }
 }
-