clean up

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

diff --git a/test_src/main-seed-test.c b/test_src/main-seed-test.c
index 78b64fea8ecaac9eca9dab52134de1c6bf6761fe..30433b8400598519fe0f364e382217cf8e7818f5 100644 (file)
--- a/test_src/main-seed-test.c
+++ b/test_src/main-seed-test.c
@@ -1,6 +1,6 @@
 /* main-seed-test.c */
 /*
-    This file is part of the This file is part of the AVR-Crypto-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
@@ -27,21 +27,27 @@
  * 
  */
 #include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
+
+#include "uart_i.h"
 #include "debug.h"
 
 #include "seed.h"
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
+#include "bcal/bcal-performance.h"
+#include "bcal/bcal_seed.h"
 
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
 
-char* cipher_name = "Seed";
+char* algo_name = "Seed";
 
+const bcdesc_t* algolist[] PROGMEM = {
+       (bcdesc_t*)&seed_desc,
+       NULL
+};
 /*****************************************************************************
  *  additional validation-functions                                          *
  *****************************************************************************/
@@ -52,7 +58,7 @@ void seed_genctx_dummy(uint8_t* key, uint16_t keysize, void* ctx){
 void testrun_nessie_seed(void){
        nessie_bc_ctx.blocksize_B =  16;
        nessie_bc_ctx.keysize_b   = 128;
-       nessie_bc_ctx.name        = cipher_name;
+       nessie_bc_ctx.name        = algo_name;
        nessie_bc_ctx.ctx_size_B  = sizeof(seed_ctx_t);
        nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)seed_enc;
        nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)seed_dec;
@@ -64,41 +70,7 @@ void testrun_nessie_seed(void){
 
 
 void testrun_performance_seed(void){
-       uint64_t t;
-       char str[16];
-       uint8_t key[16], data[16];
-       seed_ctx_t ctx;
-       
-       calibrateTimer();
-       print_overhead();
-       
-       memset(key,  0, 16);
-       memset(data, 0, 16);
-       
-       startTimer(1);
-       seed_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);
-       seed_enc(data, &ctx);
-       t = stopTimer();
-       uart_putstr_P(PSTR("\r\n\tencrypt time: "));
-       ultoa((unsigned long)t, str, 10);
-       uart_putstr(str);
-       
-       
-       startTimer(1);
-       seed_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);
 }
 
 /*****************************************************************************
@@ -107,26 +79,26 @@ void testrun_performance_seed(void){
 
 void testencrypt(uint8_t* block, uint8_t* key){
        seed_ctx_t ctx;
-       uart_putstr("\r\n==testy-encrypt==\r\n key:   ");
-       uart_hexdump(key,16);
+       cli_putstr("\r\n==testy-encrypt==\r\n key:   ");
+       cli_hexdump(key,16);
        seed_init(key, &ctx);
-       uart_putstr("\r\n plain: ");
-       uart_hexdump(block,16);
+       cli_putstr("\r\n plain: ");
+       cli_hexdump(block,16);
        seed_enc(block, &ctx);
-       uart_putstr("\r\n crypt: ");
-       uart_hexdump(block,16);
+       cli_putstr("\r\n crypt: ");
+       cli_hexdump(block,16);
 }
 
 void testdecrypt(uint8_t* block, uint8_t* key){
        seed_ctx_t ctx;
-       uart_putstr("\r\n==testy-decrypt==\r\n key:   ");
-       uart_hexdump(key,16);
+       cli_putstr("\r\n==testy-decrypt==\r\n key:   ");
+       cli_hexdump(key,16);
        seed_init(key, &ctx);
-       uart_putstr("\r\n crypt: ");
-       uart_hexdump(block,16);
+       cli_putstr("\r\n crypt: ");
+       cli_hexdump(block,16);
        seed_dec(block, &ctx);
-       uart_putstr("\r\n plain: ");
-       uart_hexdump(block,16);
+       cli_putstr("\r\n plain: ");
+       cli_hexdump(block,16);
 }
 
 void testrun_seed(void){
@@ -163,27 +135,28 @@ void testrun_seed(void){
  *  main                                                                     *
  *****************************************************************************/
 
-int main (void){
-       char str[20];
+const char nessie_str[]      PROGMEM = "nessie";
+const char test_str[]        PROGMEM = "test";
+const char performance_str[] PROGMEM = "performance";
+const char echo_str[]        PROGMEM = "echo";
 
-       DEBUG_INIT();
+cmdlist_entry_t cmdlist[] PROGMEM = {
+       { nessie_str,      NULL, testrun_nessie_seed},
+       { test_str,        NULL, testrun_seed},
+       { performance_str, NULL, testrun_performance_seed},
+       { echo_str,    (void*)1, (void_fpt)echo_ctrl},
+       { NULL,            NULL, NULL}
+};
 
-       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\0performance\0");
-       void_fpt v[] = {testrun_nessie_seed, testrun_seed, testrun_performance_seed};
-
-       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);
+       }
 }
-