a lot of fixes

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

diff --git a/test_src/main-grain-test.c b/test_src/main-grain-test.c
index d1de7eafed7a8d5246dada45d571e437b7ead813..7963e344d4eacd5469cd199477940cc2a0d2a346 100644 (file)
--- a/test_src/main-grain-test.c
+++ b/test_src/main-grain-test.c
@@ -22,13 +22,15 @@
 */
 
 #include "config.h"
-#include "serial-tools.h"
+
 #include "uart_i.h"
 #include "debug.h"
 #include "cli.h"
 
 #include "grain.h"
-#include "nessie_stream_test.h"
+#include "scal_grain.h"
+#include "scal-basic.h"
+#include "scal-nessie.h"
 #include "performance_test.h"
 
 #include <stdlib.h>
@@ -64,15 +66,8 @@ uint8_t grain_getbyte_dummy_rev(grain_ctx_t* ctx){
 }
 
 void testrun_nessie_grain(void){
-       nessie_stream_ctx.outsize_b =   8; /* actually unused */
-       nessie_stream_ctx.keysize_b =  80; /* this is the one we have refrence vectors for */
-       nessie_stream_ctx.ivsize_b  =  64;
-       nessie_stream_ctx.name = algo_name;
-       nessie_stream_ctx.ctx_size_B = sizeof(grain_ctx_t);
-       nessie_stream_ctx.cipher_genctx = (nessie_stream_genctx_fpt)grain_genctx_dummy;
-       nessie_stream_ctx.cipher_enc = (nessie_stream_genenc_fpt)grain_getbyte_dummy_rev;
-       
-       nessie_stream_run();    
+       scal_nessie_set_estream(1);
+       scal_nessie_run(&grain_desc);
 }
 
 
@@ -158,7 +153,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_grain },
        { test_str,        NULL, testrun_std_grain},
        { performance_str, NULL, testrun_performance_grain},