X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-mickey128-test.c;h=1da8b4d6c78eef0f312f7d3cc34bed7d8a31465d;hb=22985930c9c2c610ae18e2d8df0f3ea78a082134;hp=5547ccf672749a0457db599ae8796a5df7f0e81a;hpb=d1d3ca64870a4cc4ee0659db7b4387e1dd51549f;p=avr-crypto-lib.git

diff --git a/test_src/main-mickey128-test.c b/test_src/main-mickey128-test.c
index 5547ccf..1da8b4d 100644
--- a/test_src/main-mickey128-test.c
+++ b/test_src/main-mickey128-test.c
@@ -3,37 +3,23 @@
  * 
 */
 
-#include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
-#include "debug.h"
-#include "cli.h"
 
-#include "mickey128.h"
-#include "nessie_stream_test.h"
+#include "main-test-common.h"
 
-#include <stdint.h>
-#include <string.h>
+#include "mickey128.h"
+#include "scal_mickey128.h"
+#include "scal-basic.h"
+#include "scal-nessie.h"
 
-char* algo_name = "Mickey128";
+char *algo_name = "Mickey128";
 
 /*****************************************************************************
  *  additional validation-functions											 *
  *****************************************************************************/
-void mickey128_genctx_dummy(uint8_t* key, uint16_t keysize_b, void* ctx){
-	mickey128_init(key, keysize_b, NULL, 0, ctx);
-}
 
 void testrun_nessie_mickey128(void){
-	nessie_stream_ctx.outsize_b =   8; /* actually unused */
-	nessie_stream_ctx.keysize_b = 128; /* this is the one we have refrence vectors for */
-	nessie_stream_ctx.ivsize_b  =   0;
-	nessie_stream_ctx.name = algo_name;
-	nessie_stream_ctx.ctx_size_B = sizeof(mickey128_ctx_t);
-	nessie_stream_ctx.cipher_genctx = (nessie_stream_genctx_fpt)mickey128_genctx_dummy;
-	nessie_stream_ctx.cipher_enc = (nessie_stream_genenc_fpt)mickey128_getbyte;
-	
-	nessie_stream_run();	
+	scal_nessie_set_estream(1);
+	scal_nessie_run(&mickey128_desc);
 }
 
 void testrun_ref_mickey128(void){
@@ -127,7 +113,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_mickey128},
 	{ test_str,        NULL, testrun_ref_mickey128},
 	{ echo_str,    (void*)1, (void_fpt)echo_ctrl},
@@ -135,14 +121,10 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 };
 
 int main (void){
-	DEBUG_INIT();
-	
-	cli_rx = uart_getc;
-	cli_tx = uart_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);
 	}
 }