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

diff --git a/test_src/main-noekeon-test.c b/test_src/main-noekeon-test.c
index f19a91c..1b6f550 100644
--- a/test_src/main-noekeon-test.c
+++ b/test_src/main-noekeon-test.c
@@ -1,7 +1,7 @@
 /* main-noekeon-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,25 +21,17 @@
  * 
 */
 
-#include "config.h"
+#include "main-test-common.h"
 
-#include "uart_i.h"
-#include "debug.h"
-
-#include <noekeon/noekeon.h>
-#include "nessie_bc_test.h"
-#include "cli.h"
+#include "noekeon.h"
+#include "bcal-nessie.h"
 #include "performance_test.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_noekeon.h"
-
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
+#include "bcal-performance.h"
+#include "bcal_noekeon.h"
 
-char* algo_name = "Noekeon";
+char *algo_name = "Noekeon";
 
-const bcdesc_t* algolist[] PROGMEM = {
+const bcdesc_t *const algolist[] PROGMEM = {
 	(bcdesc_t*)&noekeon_direct_desc,
 	(bcdesc_t*)&noekeon_indirect_desc,
 	NULL
@@ -47,57 +39,17 @@ const bcdesc_t* algolist[] PROGMEM = {
 /*****************************************************************************
  *  additional validation-functions											 *
  *****************************************************************************/
-void noekeon_genctx_dummy(uint8_t* key, uint16_t keysize, void* ctx){
-	noekeon_init(key, ctx);
-}
-
-void testrun_nessie_noekeon_indirect(void){
-	char str[strlen(algo_name)+10];
-	strcpy(str, algo_name);
-	strcat(str, "-indirect");
-	
-	nessie_bc_ctx.blocksize_B =  16;
-	nessie_bc_ctx.keysize_b   = 128;
-	nessie_bc_ctx.name        = str;
-	nessie_bc_ctx.ctx_size_B  = sizeof(noekeon_ctx_t);
-	nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)noekeon_enc;
-	nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)noekeon_dec;
-	nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)noekeon_genctx_dummy;
-	
-	nessie_bc_run();
-}
-
-void noekeon_genctx_dummy_direct(uint8_t* key, uint16_t keysize, void* ctx){
-	memcpy(ctx, key, 16);
-}
-
-void testrun_nessie_noekeon_direct(void){
-	char str[strlen(algo_name)+10];
-	strcpy(str, algo_name);
-	strcat(str, "-Direct");
-	
-	nessie_bc_ctx.blocksize_B =  16;
-	nessie_bc_ctx.keysize_b   = 128;
-	nessie_bc_ctx.name        = str;
-	nessie_bc_ctx.ctx_size_B  = sizeof(noekeon_ctx_t);
-	nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)noekeon_enc;
-	nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)noekeon_dec;
-	nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)noekeon_genctx_dummy_direct;
-	
-	nessie_bc_run();
-}
 
 void testrun_nessie_noekeon(void){
-	testrun_nessie_noekeon_direct();
-	testrun_nessie_noekeon_indirect();
+	bcal_nessie_multiple(algolist);
 }
 
 
-void testrun_stdtest_rundirect(void* data, void* key){
+void testrun_stdtest_rundirect(void *data, void *key){
 	cli_putstr_P(PSTR("\r\n                     "));
 	cli_putstr_P(PSTR("k = "));
 	cli_hexdump(key,16);
-	
+
 	cli_putstr_P(PSTR("\r\n                     "));
 	cli_putstr_P(PSTR("a = "));
 	cli_hexdump(data,16);
@@ -112,7 +64,7 @@ void testrun_stdtest_rundirect(void* data, void* key){
 	cli_putstr_P(PSTR("\r\n"));
 }
 
-void testrun_stdtest_runindirect(void* data, void* key){
+void testrun_stdtest_runindirect(void *data, void *key){
 	noekeon_ctx_t ctx;
 	cli_putstr_P(PSTR("\r\n                     "));
 	cli_putstr_P(PSTR("k = "));
@@ -193,25 +145,21 @@ const char indirect_str[]    PROGMEM = "indirect";
 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_noekeon},
 	{ test_str,        NULL, testrun_stdtest_noekeon},
-	{ direct_str,      NULL, testrun_nessie_noekeon_direct},
-	{ indirect_str,    NULL, testrun_nessie_noekeon_indirect},
+//	{ direct_str,      NULL, testrun_nessie_noekeon_direct},
+//	{ indirect_str,    NULL, testrun_nessie_noekeon_indirect},
 	{ performance_str, NULL, testrun_performance_noekeon},
 	{ echo_str,    (void*)1, (void_fpt)echo_ctrl},
 	{ NULL,            NULL, NULL}
 };
 
 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);
 	}
 }