X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-arcfour-test.c;h=760479b21bae2a81532f6c337f170d03eaba94dc;hb=89bbbf7604fa48ddba5877263220791045b6ee6f;hp=7e5489220743ca22447c97027dfb7979fb51b396;hpb=52ec168ece9d61bd9cb652235dfe8faee6232a11;p=avr-crypto-lib.git

diff --git a/test_src/main-arcfour-test.c b/test_src/main-arcfour-test.c
index 7e54892..760479b 100644
--- a/test_src/main-arcfour-test.c
+++ b/test_src/main-arcfour-test.c
@@ -22,15 +22,18 @@
 */
 
 #include "config.h"
-#include "serial-tools.h"
+
 #include "uart_i.h"
 #include "debug.h"
 
 #include <arcfour.h>
-#include "nessie_stream_test.h"
 #include "cli.h"
 #include "performance_test.h"
 
+#include "scal_arcfour.h"
+#include "scal-basic.h"
+#include "scal-nessie.h"
+
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
@@ -44,18 +47,8 @@ void arcfour_genctx_dummy(uint8_t* key, uint16_t keysize, void* ctx){
 	arcfour_init(key, (uint8_t)((keysize+7)/8), ctx);
 }
 
-
-
 void testrun_nessie_arcfour(void){
-	nessie_stream_ctx.outsize_b = 8; /* actually unused */
-	nessie_stream_ctx.keysize_b = 128; /* this is theone we have refrence vectors for */
-	nessie_stream_ctx.ivsize_b = (uint16_t)-1;
-	nessie_stream_ctx.name = algo_name;
-	nessie_stream_ctx.ctx_size_B = sizeof(arcfour_ctx_t);
-	nessie_stream_ctx.cipher_genctx = (nessie_stream_genctx_fpt)arcfour_genctx_dummy;
-	nessie_stream_ctx.cipher_enc = (nessie_stream_genenc_fpt)arcfour_gen;
-	
-	nessie_stream_run();	
+	scal_nessie_run(&arcfour_desc);
 }
 
 void testrun_performance_arcfour(void){