]> git.cryptolib.org Git - avr-crypto-lib.git/blobdiff - test_src/main-grain-test.c
fixing E-Mail-Address & Copyright
[avr-crypto-lib.git] / test_src / main-grain-test.c
index d09e0024d53a57d32a37cba70bbcb4628e1ec08e..585589c31110bf94405f474f211d74ad9d1856d1 100644 (file)
@@ -1,7 +1,7 @@
 /* main-grain-test.c */
 /*
-    This file is part of the This file is part of the AVR-Crypto-Lib.
-    Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
+    This file is part of the AVR-Crypto-Lib.
+    Copyright (C) 2006-2015 Daniel Otte (bg@nerilex.org)
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
  * 
 */
 
-#include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
-#include "debug.h"
-#include "cli.h"
+#include "main-test-common.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>
-#include <stdint.h>
-#include <string.h>
-
-char* cipher_name = "Grain";
+char *algo_name = "Grain";
 
 /*****************************************************************************
  *  additional validation-functions                                          *
  *****************************************************************************/
-void grain_genctx_dummy(uint8_t* key, uint16_t keysize_b, void* ctx){
+void grain_genctx_dummy(uint8_t *key, uint16_t keysize_b, void *ctx){
        uint8_t iv[8]={0};
        grain_init(key, &iv, ctx);
 }
 
-uint8_t grain_getbyte_dummy(grain_ctx_tctx){
+uint8_t grain_getbyte_dummy(grain_ctx_t *ctx){
        uint8_t i,ret=0;
        for(i=0; i<8; ++i){
                ret<<=1;
@@ -54,7 +48,7 @@ uint8_t grain_getbyte_dummy(grain_ctx_t* ctx){
        return ret;
 }
 
-uint8_t grain_getbyte_dummy_rev(grain_ctx_tctx){
+uint8_t grain_getbyte_dummy_rev(grain_ctx_t *ctx){
        uint8_t i,ret=0;
        for(i=0; i<8; ++i){
                ret >>= 1;
@@ -64,15 +58,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 = cipher_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);
 }
 
 
@@ -83,17 +70,17 @@ void testrun_std_grain(void){
        /* 1 */
        memset(key, 0, 10);
        memset(iv, 0, 8);
-       uart_putstr_P(PSTR("\r\n=== std test ==="));
-       uart_putstr_P(PSTR("\r\n key: "));
-       uart_hexdump(key, 10);
-       uart_putstr_P(PSTR("\r\n iv:  "));
-       uart_hexdump(key, 8);
+       cli_putstr_P(PSTR("\r\n=== std test ==="));
+       cli_putstr_P(PSTR("\r\n key: "));
+       cli_hexdump(key, 10);
+       cli_putstr_P(PSTR("\r\n iv:  "));
+       cli_hexdump(key, 8);
        grain_init(key, iv, &ctx);
        for(i=0; i<10; ++i){
                out[i] = grain_getbyte_dummy(&ctx);
        }
-       uart_putstr_P(PSTR("\r\n out: "));
-       uart_hexdump(out, 10);
+       cli_putstr_P(PSTR("\r\n out: "));
+       cli_hexdump(out, 10);
        
        /* 2 */
        for(i=0; i<8; ++i){
@@ -105,19 +92,19 @@ void testrun_std_grain(void){
        for(i=0; i<8; ++i){
                iv[i] = i*0x22+1;
        }
-       uart_putstr_P(PSTR("\r\n\r\n key: "));
-       uart_hexdump(key, 10);
-       uart_putstr_P(PSTR("\r\n iv:  "));
-       uart_hexdump(key, 8);
+       cli_putstr_P(PSTR("\r\n\r\n key: "));
+       cli_hexdump(key, 10);
+       cli_putstr_P(PSTR("\r\n iv:  "));
+       cli_hexdump(key, 8);
        grain_init(key, iv, &ctx);
        for(i=0; i<10; ++i){
                out[i] = grain_getbyte_dummy(&ctx);
        }
-       uart_putstr_P(PSTR("\r\n out: "));
-       uart_hexdump(out, 10);
+       cli_putstr_P(PSTR("\r\n out: "));
+       cli_hexdump(out, 10);
        
        
-       uart_putstr_P(PSTR("\r\n\r\n"));
+       cli_putstr_P(PSTR("\r\n\r\n"));
 }
 
 void testrun_performance_grain(void){
@@ -135,46 +122,42 @@ void testrun_performance_grain(void){
        startTimer(1);
        grain_init(key, iv, &ctx);
        t = stopTimer();
-       uart_putstr_P(PSTR("\r\n\tctx-gen time: "));
+       cli_putstr_P(PSTR("\r\n\tctx-gen time: "));
        ultoa((unsigned long)t, str, 10);
-       uart_putstr(str);       
+       cli_putstr(str);        
        
        startTimer(1);
        grain_enc(&ctx);
        t = stopTimer();
-       uart_putstr_P(PSTR("\r\n\tencrypt time: "));
+       cli_putstr_P(PSTR("\r\n\tencrypt time: "));
        ultoa((unsigned long)t, str, 10);
-       uart_putstr(str);       
+       cli_putstr(str);        
        
-       uart_putstr_P(PSTR("\r\n"));
+       cli_putstr_P(PSTR("\r\n"));
 }
 
 /*****************************************************************************
  *  main                                                                     *
  *****************************************************************************/
 
-int main (void){
-       char  str[20];
-       DEBUG_INIT();
-       uart_putstr("\r\n");
-
-       uart_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
-       uart_putstr(cipher_name);
-       uart_putstr_P(PSTR(")\r\nloaded and running\r\n"));
-
-       PGM_P    u   = PSTR("nessie\0test\0performance\0");
-       void_fpt v[] = {testrun_nessie_grain, testrun_std_grain, testrun_performance_grain};
-
-       while(1){ 
-               if (!getnextwordn(str,20)){DEBUG_S("DBG: W1\r\n"); goto error;}
-               if(execcommand_d0_P(str, u, v)<0){
-                       uart_putstr_P(PSTR("\r\nunknown command\r\n"));
-               }
-               continue;
-       error:
-               uart_putstr("ERROR\r\n");
-       }       
-}
+const char nessie_str[]      PROGMEM = "nessie";
+const char test_str[]        PROGMEM = "test";
+const char performance_str[] PROGMEM = "performance";
+const char echo_str[]        PROGMEM = "echo";
 
+const cmdlist_entry_t cmdlist[] PROGMEM = {
+       { nessie_str,      NULL, testrun_nessie_grain },
+       { test_str,        NULL, testrun_std_grain},
+       { performance_str, NULL, testrun_performance_grain},
+       { echo_str,    (void*)1, (void_fpt)echo_ctrl},
+       { NULL,            NULL, NULL}
+};
 
+int main (void){
+    main_setup();
 
+    for(;;){
+        welcome_msg(algo_name);
+        cmd_interface(cmdlist);
+       }
+}