fixing some decryption bugs in GCM128

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

diff --git a/test_src/main-mickey128-test.c b/test_src/main-mickey128-test.c
index cd83212a859431e67df676cf2a7c10c35b49873a..1da8b4d6c78eef0f312f7d3cc34bed7d8a31465d 100644 (file)
--- 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_i.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 = (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);
        }
 }