optimizing norx32

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

diff --git a/test_src/main-cast6-test.c b/test_src/main-cast6-test.c
index bc7cb735f6bfbadb3ca041920e6f2754afbd6cb8..30d49f8d5579f2b050254b5be8ac721efa50d842 100644 (file)
--- a/test_src/main-cast6-test.c
+++ b/test_src/main-cast6-test.c
@@ -3,26 +3,17 @@
  * 
 */
 
-#include "config.h"
-
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "cast6.h"
-#include "nessie_bc_test.h"
-#include "cli.h"
 #include "performance_test.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_cast6.h"
-
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include <avr/pgmspace.h>
+#include "bcal-performance.h"
+#include "bcal-nessie.h"
+#include "bcal_cast6.h"
 
-char* algo_name = "CAST-256";
+char *algo_name = "CAST-256";
 
-const bcdesc_t* algolist[] PROGMEM = {
+const bcdesc_t *const algolist[] PROGMEM = {
        (bcdesc_t*)&cast6_desc,
        NULL
 };
@@ -33,22 +24,7 @@ const bcdesc_t* algolist[] PROGMEM = {
 
 
 void testrun_nessie_cast6(void){
-       nessie_bc_init();
-       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(cast6_ctx_t);
-       nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)cast6_enc;
-       nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)cast6_dec;
-       nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)cast6_init;
-       
-       nessie_bc_run();
-       
-       nessie_bc_ctx.keysize_b   = 192;
-       nessie_bc_run();
-       
-       nessie_bc_ctx.keysize_b   = 256;
-       nessie_bc_run();
+       bcal_nessie_multiple(algolist);
 }
 
 void testrun_rfc_cast6(void){
@@ -123,7 +99,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_cast6 },
        { test_str,        NULL, testrun_rfc_cast6},
        { performance_str, NULL, testrun_performance_cast6},
@@ -132,13 +108,10 @@ 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);
        }
 }