X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-rc5-test.c;h=46f5e75db07c77bd4b7945cad271ffb5935f9d33;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hp=6c7da70094c45e1879329c82a073f44e01160389;hpb=7b5401ab9ce23a5da1de8b6c7de3a1aa20ac4cf8;p=avr-crypto-lib.git

diff --git a/test_src/main-rc5-test.c b/test_src/main-rc5-test.c
index 6c7da70..46f5e75 100644
--- a/test_src/main-rc5-test.c
+++ b/test_src/main-rc5-test.c
@@ -1,7 +1,7 @@
 /* main-rc5-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,26 +21,18 @@
  * 
 */
 
-#include "config.h"
-
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "rc5.h"
-#include "nessie_bc_test.h"
-#include "cli.h"
 #include "performance_test.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_rc5.h"
-
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
+#include "bcal-performance.h"
+#include "bcal-nessie.h"
+#include "bcal_rc5.h"
 
 #define RC5_ROUNDS 12
-char* algo_name = "RC5-32/12/16";
+char *algo_name = "RC5-32/12/16";
 
-const bcdesc_t* algolist[] PROGMEM = {
+const bcdesc_t *const algolist[] PROGMEM = {
 	(bcdesc_t*)&rc5_desc,
 	NULL
 };
@@ -48,22 +40,12 @@ const bcdesc_t* algolist[] PROGMEM = {
 /*****************************************************************************
  *  additional validation-functions											 *
  *****************************************************************************/
-void rc5_genctx_dummy(uint8_t* key, uint16_t keysize_b, void* ctx){
+void rc5_genctx_dummy(uint8_t *key, uint16_t keysize_b, void *ctx){
 	rc5_init(key, keysize_b, RC5_ROUNDS, ctx);
 }
 
 void testrun_nessie_rc5(void){
-	nessie_bc_init();
-	nessie_bc_ctx.blocksize_B =   8;
-	nessie_bc_ctx.keysize_b   = 128;
-	nessie_bc_ctx.name        = algo_name;
-	nessie_bc_ctx.ctx_size_B  = sizeof(rc5_ctx_t);
-	nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)rc5_enc;
-	nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)rc5_dec;
-	nessie_bc_ctx.cipher_free = (nessie_bc_free_fpt)rc5_free;
-	nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)rc5_genctx_dummy;
-	
-	nessie_bc_run();
+	bcal_nessie_multiple(algolist);
 }
 
 
@@ -79,7 +61,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_rc5 },
 	{ test_str,        NULL, testrun_nessie_rc5},
 	{ performance_str, NULL, testrun_performance_rc5},
@@ -88,14 +70,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);
 	}
 }