fixing E-Mail-Address & Copyright

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

diff --git a/test_src/main-noekeon-test.c b/test_src/main-noekeon-test.c
index a08f38ff3271d8c1089e541902ce665c9ee624dc..1b6f55004396b7c42bafa705cfb676e1a3ece0ff 100644 (file)
--- a/test_src/main-noekeon-test.c
+++ b/test_src/main-noekeon-test.c
@@ -1,7 +1,7 @@
 /* main-noekeon-test.c */
 /*
     This file is part of the AVR-Crypto-Lib.
-    Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
+    Copyright (C) 2006-2015 Daniel Otte (bg@nerilex.org)
 
     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
@@ -21,76 +21,35 @@
  * 
 */
 
-#include "config.h"
-#include "serial-tools.h"
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
-#include <noekeon.h>
-#include "nessie_bc_test.h"
-#include "cli.h"
+#include "noekeon.h"
+#include "bcal-nessie.h"
 #include "performance_test.h"
+#include "bcal-performance.h"
+#include "bcal_noekeon.h"
 
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-
-char* algo_name = "Noekeon";
+char *algo_name = "Noekeon";
 
+const bcdesc_t *const algolist[] PROGMEM = {
+       (bcdesc_t*)&noekeon_direct_desc,
+       (bcdesc_t*)&noekeon_indirect_desc,
+       NULL
+};
 /*****************************************************************************
  *  additional validation-functions                                                                                     *
  *****************************************************************************/
-void noekeon_genctx_dummy(uint8_t* key, uint16_t keysize, void* ctx){
-       noekeon_init(key, ctx);
-}
-
-void testrun_nessie_noekeon_indirect(void){
-       char str[strlen(algo_name)+10];
-       strcpy(str, algo_name);
-       strcat(str, "-indirect");
-       
-       nessie_bc_ctx.blocksize_B =  16;
-       nessie_bc_ctx.keysize_b   = 128;
-       nessie_bc_ctx.name        = str;
-       nessie_bc_ctx.ctx_size_B  = sizeof(noekeon_ctx_t);
-       nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)noekeon_enc;
-       nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)noekeon_dec;
-       nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)noekeon_genctx_dummy;
-       
-       nessie_bc_run();
-}
-
-void noekeon_genctx_dummy_direct(uint8_t* key, uint16_t keysize, void* ctx){
-       memcpy(ctx, key, 16);
-}
-
-void testrun_nessie_noekeon_direct(void){
-       char str[strlen(algo_name)+10];
-       strcpy(str, algo_name);
-       strcat(str, "-Direct");
-       
-       nessie_bc_ctx.blocksize_B =  16;
-       nessie_bc_ctx.keysize_b   = 128;
-       nessie_bc_ctx.name        = str;
-       nessie_bc_ctx.ctx_size_B  = sizeof(noekeon_ctx_t);
-       nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)noekeon_enc;
-       nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)noekeon_dec;
-       nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)noekeon_genctx_dummy_direct;
-       
-       nessie_bc_run();
-}
 
 void testrun_nessie_noekeon(void){
-       testrun_nessie_noekeon_direct();
-       testrun_nessie_noekeon_indirect();
+       bcal_nessie_multiple(algolist);
 }
 
 
-void testrun_stdtest_rundirect(void* data, void* key){
+void testrun_stdtest_rundirect(void *data, void *key){
        cli_putstr_P(PSTR("\r\n                     "));
        cli_putstr_P(PSTR("k = "));
        cli_hexdump(key,16);
-       
+
        cli_putstr_P(PSTR("\r\n                     "));
        cli_putstr_P(PSTR("a = "));
        cli_hexdump(data,16);
@@ -105,7 +64,7 @@ void testrun_stdtest_rundirect(void* data, void* key){
        cli_putstr_P(PSTR("\r\n"));
 }
 
-void testrun_stdtest_runindirect(void* data, void* key){
+void testrun_stdtest_runindirect(void *data, void *key){
        noekeon_ctx_t ctx;
        cli_putstr_P(PSTR("\r\n                     "));
        cli_putstr_P(PSTR("k = "));
@@ -173,39 +132,7 @@ 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();
-       cli_putstr_P(PSTR("\r\n\tctx-gen time: "));
-       ultoa((unsigned long)t, str, 10);
-       cli_putstr(str);        
-       
-       startTimer(1);
-       noekeon_enc(data, &ctx);
-       t = stopTimer();
-       cli_putstr_P(PSTR("\r\n\tencrypt time: "));
-       ultoa((unsigned long)t, str, 10);
-       cli_putstr(str);        
-       
-       startTimer(1);
-       noekeon_dec(data, &ctx);
-       t = stopTimer();
-       cli_putstr_P(PSTR("\r\n\tdecrypt time: "));
-       ultoa((unsigned long)t, str, 10);
-       cli_putstr(str);
-       
-       cli_putstr_P(PSTR("\r\n"));
+       bcal_performance_multiple(algolist);
 }
 /*****************************************************************************
  *  main                                                                                                                                        *
@@ -218,25 +145,21 @@ const char indirect_str[]    PROGMEM = "indirect";
 const char performance_str[] PROGMEM = "performance";
 const char echo_str[]        PROGMEM = "echo";
 
-cmdlist_entry_t cmdlist[] PROGMEM = {
+const 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},
+//     { 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){
-       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);
+    main_setup();
+
+    for(;;){
+        welcome_msg(algo_name);
+        cmd_interface(cmdlist);
        }
 }