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

diff --git a/test_src/main-threefish-test.c b/test_src/main-threefish-test.c
index f01aef7..af85446 100644
--- a/test_src/main-threefish-test.c
+++ b/test_src/main-threefish-test.c
@@ -1,7 +1,7 @@
 /* main-threefish-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,27 +21,20 @@
  * 
 */
 
-#include "config.h"
 
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "threefish.h"
-#include "nessie_bc_test.h"
-#include "cli.h"
 #include "performance_test.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_threefish256.h"
-#include "bcal/bcal_threefish512.h"
-#include "bcal/bcal_threefish1024.h"
+#include "bcal-performance.h"
+#include "bcal-nessie.h"
+#include "bcal_threefish256.h"
+#include "bcal_threefish512.h"
+#include "bcal_threefish1024.h"
 
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
+char *algo_name = "Threefish";
 
-char* algo_name = "Threefish";
-
-const bcdesc_t* algolist[] PROGMEM = {
+const bcdesc_t *const algolist[] PROGMEM = {
 	(bcdesc_t*)&threefish256_desc,
 	(bcdesc_t*)&threefish512_desc,
 	(bcdesc_t*)&threefish1024_desc,
@@ -51,7 +44,7 @@ const bcdesc_t* algolist[] PROGMEM = {
  *  additional validation-functions											 *
  *****************************************************************************/
 
-void threefish256_dump(threefish256_ctx_t* ctx){
+void threefish256_dump(threefish256_ctx_t *ctx){
 	uint8_t i;
 	cli_putstr_P(PSTR("\r\n=== ctx dump (256) === \r\n k: "));
 	for(i=0; i<5; ++i){
@@ -65,61 +58,8 @@ void threefish256_dump(threefish256_ctx_t* ctx){
 	}
 }
 
-void threefish256_dummy_init(const uint8_t* key, uint16_t keysize_b, void* ctx){
-	threefish256_init(key, NULL, ctx);
-}
-
-void testrun_nessie_threefish256(void){
-	nessie_bc_ctx.keysize_b = 256;
-	nessie_bc_ctx.blocksize_B = 32;
-	nessie_bc_ctx.ctx_size_B = sizeof(threefish256_ctx_t);
-	nessie_bc_ctx.name = "Threefish256";
-	nessie_bc_ctx.cipher_genctx = threefish256_dummy_init;
-	nessie_bc_ctx.cipher_enc = (nessie_bc_enc_fpt)threefish256_enc;
-	nessie_bc_ctx.cipher_dec = (nessie_bc_dec_fpt)threefish256_dec;
-	nessie_bc_ctx.cipher_free = NULL;
-	
-	nessie_bc_run();
-}
-
-void threefish512_dummy_init(const uint8_t* key, uint16_t keysize_b, void* ctx){
-	threefish512_init(key, NULL, ctx);
-}
-
-void testrun_nessie_threefish512(void){
-	nessie_bc_ctx.keysize_b = 512;
-	nessie_bc_ctx.blocksize_B = 64;
-	nessie_bc_ctx.ctx_size_B = sizeof(threefish512_ctx_t);
-	nessie_bc_ctx.name = "Threefish512";
-	nessie_bc_ctx.cipher_genctx = threefish512_dummy_init;
-	nessie_bc_ctx.cipher_enc = (nessie_bc_enc_fpt)threefish512_enc;
-	nessie_bc_ctx.cipher_dec = (nessie_bc_dec_fpt)threefish512_dec;
-	nessie_bc_ctx.cipher_free = NULL;
-	
-	nessie_bc_run();
-}
-
-void threefish1024_dummy_init(const uint8_t* key, uint16_t keysize_b, void* ctx){
-	threefish1024_init(key, NULL, ctx);
-}
-
-void testrun_nessie_threefish1024(void){
-	nessie_bc_ctx.keysize_b = 1024;
-	nessie_bc_ctx.blocksize_B = 128;
-	nessie_bc_ctx.ctx_size_B = sizeof(threefish1024_ctx_t);
-	nessie_bc_ctx.name = "Threefish1024";
-	nessie_bc_ctx.cipher_genctx = threefish1024_dummy_init;
-	nessie_bc_ctx.cipher_enc = (nessie_bc_enc_fpt)threefish1024_enc;
-	nessie_bc_ctx.cipher_dec = (nessie_bc_dec_fpt)threefish1024_dec;
-	nessie_bc_ctx.cipher_free = NULL;
-	
-	nessie_bc_run();
-}
-
 void testrun_nessie_threefish(void){
-	testrun_nessie_threefish256();
-	testrun_nessie_threefish512();
-	testrun_nessie_threefish1024();
+	bcal_nessie_multiple(algolist);
 }
 
 void testrun_stdtest_threefish256(void){
@@ -307,7 +247,7 @@ const char inittest_str[]    PROGMEM = "inittest";
 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_threefish},
 	{ test_str,        NULL, testrun_stdtest_threefish},
     { test256_str,     NULL, testrun_stdtest_threefish256},
@@ -320,14 +260,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);
 	}
 }