some minor improvments and bug fixes

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

diff --git a/test_src/main-camellia-test.c b/test_src/main-camellia-test.c
index fb9f88170389a1f641859bca702b52d35e405a9c..39702db4012b67576c41f9f3ac11a22f5f02d22b 100644 (file)
--- a/test_src/main-camellia-test.c
+++ b/test_src/main-camellia-test.c
@@ -21,25 +21,17 @@
  * 
  */
 
-#include "config.h"
-
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "camellia.h"
-#include "nessie_bc_test.h"
 #include "performance_test.h"
-#include "cli.h"
 #include "bcal_camellia128.h"
 #include "bcal-performance.h"
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include <avr/pgmspace.h>
+#include "bcal-nessie.h"
 
 char* algo_name = "Camellia";
 
-const bcdesc_t* algolist[] PROGMEM = {
+const bcdesc_t* const algolist[] PROGMEM = {
        (bcdesc_t*)&camellia128_desc,
        NULL
 };
@@ -47,27 +39,16 @@ const bcdesc_t* algolist[] PROGMEM = {
 /*****************************************************************************
  *  additional validation-functions                                                                                     *
  *****************************************************************************/
-void camellia128_init_dummy(void* key, uint16_t keysize_b, void* ctx){
-       camellia128_init(key, ctx);
-}
 
 void testrun_nessie_camellia(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(camellia128_ctx_t);
-       nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)camellia128_enc;
-       nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)camellia128_dec;
-       nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)camellia128_init_dummy;
-       
-       nessie_bc_run();
+       bcal_nessie_multiple(algolist);
 }
 
 /*
  * P No.001 : 80 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
  */
 
-uint8_t test_keys[] PROGMEM = {
+const uint8_t test_keys[] PROGMEM = {
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
        0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F,
@@ -184,7 +165,7 @@ const char test128_str[]     PROGMEM = "test128";
 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_camellia },
        { test_str,        NULL, testrun_camellia},
        { test128_str,     NULL, testrun_camellia128},
@@ -194,15 +175,11 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 };
 
 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);
        }
 }