adding Salsa20

[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 5547ccf672749a0457db599ae8796a5df7f0e81a..9b629536ee42795933efe71c326e8a170fa9a5d7 100644 (file)
--- a/test_src/main-mickey128-test.c
+++ b/test_src/main-mickey128-test.c
@@ -4,13 +4,15 @@
 */
 
 #include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
+
+#include "uart_i.h"
 #include "debug.h"
 #include "cli.h"
 
 #include "mickey128.h"
-#include "nessie_stream_test.h"
+#include "scal_mickey128.h"
+#include "scal-basic.h"
+#include "scal-nessie.h"
 
 #include <stdint.h>
 #include <string.h>
@@ -20,20 +22,9 @@ 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_run(&mickey128_desc);
 }
 
 void testrun_ref_mickey128(void){
@@ -137,8 +128,8 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 int main (void){
        DEBUG_INIT();
        
-       cli_rx = uart_getc;
-       cli_tx = uart_putc;             
+       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);