clean up

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

diff --git a/test_src/main-present-test.c b/test_src/main-present-test.c
index 4c739bcd2f8436d20f215fcea0ee85af36e85cbc..23d350644386e34fee5b67e26affb875f2ec94eb 100644 (file)
--- a/test_src/main-present-test.c
+++ b/test_src/main-present-test.c
@@ -1,6 +1,6 @@
 /* main-present-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
@@ -22,21 +22,27 @@
 */
 
 #include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
+
+#include "uart_i.h"
 #include "debug.h"
 
-#include "present.h"
+#include <present.h>
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
+#include "bcal/bcal-performance.h"
+#include "bcal/bcal_present.h"
 
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
 
-char* cipher_name = "Present";
+char* algo_name = "Present";
 
+const bcdesc_t* algolist[] PROGMEM = {
+       (bcdesc_t*)&present_desc,
+       NULL
+};
 /*****************************************************************************
  *  additional validation-functions                                                                                     *
  *****************************************************************************/
@@ -47,7 +53,7 @@ void present_genctx_dummy(uint8_t* key, uint16_t keysize_b, present_ctx_t* ctx){
 void testrun_nessie_present(void){
        nessie_bc_ctx.blocksize_B =   8;
        nessie_bc_ctx.keysize_b   =  80;
-       nessie_bc_ctx.name        = cipher_name;
+       nessie_bc_ctx.name        = algo_name;
        nessie_bc_ctx.ctx_size_B  = sizeof(present_ctx_t);
        nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)present_enc;
        nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)present_dec;
@@ -58,23 +64,23 @@ void testrun_nessie_present(void){
 
 void testrun_selfenc(uint8_t* key, uint8_t* buffer){
        present_ctx_t ctx;
-       uart_putstr_P(PSTR("\r\nkey   : "));
-       uart_hexdump(key, 10);
-       uart_putstr_P(PSTR("\r\nplain : "));
-       uart_hexdump(buffer, 8);
+       cli_putstr_P(PSTR("\r\nkey   : "));
+       cli_hexdump(key, 10);
+       cli_putstr_P(PSTR("\r\nplain : "));
+       cli_hexdump(buffer, 8);
        present_init(key, 80, &ctx);
        present_enc(buffer, &ctx);
-       uart_putstr_P(PSTR("\r\ncipher: "));
-       uart_hexdump(buffer, 8);
+       cli_putstr_P(PSTR("\r\ncipher: "));
+       cli_hexdump(buffer, 8);
        present_dec(buffer, &ctx);
-       uart_putstr_P(PSTR("\r\nplain : "));
-       uart_hexdump(buffer, 8);
-       uart_putstr_P(PSTR("\r\n"));
+       cli_putstr_P(PSTR("\r\nplain : "));
+       cli_hexdump(buffer, 8);
+       cli_putstr_P(PSTR("\r\n"));
 }
 
 void testrun_self_present(void){
        uint8_t buffer[8], key[10];
-       uart_putstr_P(PSTR("\r\n\r\n=== Testvectors from the paper ===\r\n"));
+       cli_putstr_P(PSTR("\r\n\r\n=== Testvectors from the paper ===\r\n"));
        
        memset(buffer, 0, 8);
        memset(key, 0, 10);
@@ -95,58 +101,35 @@ void testrun_self_present(void){
 }
 
 void testrun_performance_present(void){
-       uint64_t t;
-       uint8_t key[10], data[8];
-       present_ctx_t ctx;
-       
-       calibrateTimer();
-       print_overhead();
-       
-       memset(key,  0, 10);
-       memset(data, 0,  8);
-       
-       startTimer(1);
-       present_init(key, 80, &ctx);
-       t = stopTimer();
-       print_time_P(PSTR("\tctx-gen time: "),t);
-       
-       startTimer(1);
-       present_enc(data, &ctx);
-       t = stopTimer();
-       print_time_P(PSTR("\tencrypt time: "), t);
-       
-       startTimer(1);
-       present_dec(data, &ctx);
-       t = stopTimer();
-       print_time_P(PSTR("\tdecrypt time: "), t);
-       
-       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 performance_str[] PROGMEM = "performance";
+const char echo_str[]        PROGMEM = "echo";
+
+cmdlist_entry_t cmdlist[] PROGMEM = {
+       { nessie_str,      NULL, testrun_nessie_present},
+       { test_str,        NULL, testrun_self_present},
+       { performance_str, NULL, testrun_performance_present},
+       { 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\0performance\0");
-       void_fpt v[] = {testrun_nessie_present, testrun_self_present, testrun_performance_present};
-
-       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);
+       }
 }