fixing E-Mail-Address & Copyright

[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 8d264dccfef79d8ab5fdbb87ed2036ac7c16753b..31fef329dd7e511b6ba7c1e2483fe8103fa6d0ee 100644 (file)
--- a/test_src/main-seed-test.c
+++ b/test_src/main-seed-test.c
@@ -1,7 +1,7 @@
 /* main-seed-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
@@ -19,114 +19,71 @@
 /**
  * \file       main-seed-test.c
  * \author     Daniel Otte
- * \email      daniel.otte@rub.de
+ * \email      bg@nerilex.org
  * \date       2007-06-01
  * \brief      test suit for SEED
  * \par License        
  * GPLv3 or later
  * 
  */
-#include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
-#include "debug.h"
+
+
+#include "main-test-common.h"
 
 #include "seed.h"
-#include "nessie_bc_test.h"
-#include "cli.h"
 #include "performance_test.h"
+#include "bcal-performance.h"
+#include "bcal-nessie.h"
+#include "bcal_seed.h"
 
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-
-char* algo_name = "Seed";
+char *algo_name = "Seed";
 
+const bcdesc_t *const algolist[] PROGMEM = {
+       (bcdesc_t*)&seed_desc,
+       NULL
+};
 /*****************************************************************************
  *  additional validation-functions                                          *
  *****************************************************************************/
-void seed_genctx_dummy(uint8_t* key, uint16_t keysize, void* ctx){
+void seed_genctx_dummy(uint8_t *key, uint16_t keysize, void *ctx){
        seed_init(key, ctx);
 }
 
 void testrun_nessie_seed(void){
-       nessie_bc_ctx.blocksize_B =  16;
-       nessie_bc_ctx.keysize_b   = 128;
-       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;
-       nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)seed_genctx_dummy;
-       
-       nessie_bc_run();
-       
+       bcal_nessie_multiple(algolist);
 }
 
 
 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);
 }
 
 /*****************************************************************************
  *  self tests                                                               *
  *****************************************************************************/
 
-void testencrypt(uint8_t* block, uint8_t* key){
+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){
+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){
@@ -168,7 +125,7 @@ const char test_str[]        PROGMEM = "test";
 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_seed},
        { test_str,        NULL, testrun_seed},
        { performance_str, NULL, testrun_performance_seed},
@@ -177,14 +134,10 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 };
 
 int main (void){
-       DEBUG_INIT();
-       uart_putstr("\r\n");
-       cli_rx = uart_getc;
-       cli_tx = uart_putc;             
-       for(;;){
-               uart_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
-               uart_putstr(algo_name);
-               uart_putstr_P(PSTR(")\r\nloaded and running\r\n"));
-               cmd_interface(cmdlist);
+    main_setup();
+
+    for(;;){
+        welcome_msg(algo_name);
+        cmd_interface(cmdlist);
        }
 }