]> git.cryptolib.org Git - avr-crypto-lib.git/blobdiff - test_src/main-trivium-test.c
fixing E-Mail-Address & Copyright
[avr-crypto-lib.git] / test_src / main-trivium-test.c
index ad0f3856db625df28163926bc0ba99e87e35bc2c..20400835ede976426fd0ebb15950a3babceaf925 100644 (file)
@@ -1,7 +1,7 @@
 /* main-trivium-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
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 /*
- * Mickey128 test-suit
+ * Trivium test-suit
  * 
 */
 
-#include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
-#include "debug.h"
-#include "cli.h"
+#include "main-test-common.h"
 
 #include "trivium.h"
-#include "nessie_stream_test.h"
+#include "scal_trivium.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 = "Trivium";
+char *algo_name = "Trivium";
 
 /*****************************************************************************
  *  additional validation-functions                                                                                     *
  *****************************************************************************/
-void trivium_genctx_dummy(uint8_t* key, uint16_t keysize_b, void* ctx){
-       uint32_t iv=0;
-       trivium_init(key, 80, &iv, 32, ctx);
-}
 
-uint8_t trivium_getbyte_dummy(trivium_ctx_t* ctx){
-       uint8_t i,ret=0;
-       for(i=0; i<8; ++i){
-               ret<<=1;
-               ret |= trivium_enc(ctx);
-       }
-       return ret;
+void testrun_nessie_trivium(void){
+       scal_nessie_run(&trivium_desc);
 }
 
-void testrun_nessie_trivium(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  =  32;
-       nessie_stream_ctx.name = cipher_name;
-       nessie_stream_ctx.ctx_size_B = sizeof(trivium_ctx_t);
-       nessie_stream_ctx.cipher_genctx = (nessie_stream_genctx_fpt)trivium_genctx_dummy;
-       nessie_stream_ctx.cipher_enc = (nessie_stream_genenc_fpt)trivium_getbyte_dummy;
-       
-       nessie_stream_run();    
+void testrun_trivium(void){
+       uint8_t key[10];
+       uint8_t iv[4];
+       uint8_t buffer[64];
+       scgen_ctx_t ctx;
+       memset(key, 0, 10);
+       memset(iv, 0, 4);
+       key[0] = 0x80;
+       scal_cipher_init(&trivium_desc, key, 80, iv, 32, &ctx);
+       scal_cipher_gen_fillblock(buffer, 64, &ctx);
+       cli_putstr_P(PSTR("\r\nTest:\r\n  Key     = "));
+       cli_hexdump(key, 10);
+       cli_putstr_P(PSTR("\r\n  IV      = "));
+       cli_hexdump(iv, 4);
+       cli_putstr_P(PSTR("\r\n  Cipher  = "));
+       cli_hexdump_block(buffer, 64, 4, 16);
+       scal_cipher_free(&ctx);
+       key[0] = 0x40;
+       scal_cipher_init(&trivium_desc, key, 80, iv, 32, &ctx);
+       scal_cipher_gen_fillblock(buffer, 64, &ctx);
+       cli_putstr_P(PSTR("\r\nTest:\r\n  Key     = "));
+       cli_hexdump(key, 10);
+       cli_putstr_P(PSTR("\r\n  IV      = "));
+       cli_hexdump(iv, 4);
+       cli_putstr_P(PSTR("\r\n  Cipher  = "));
+       cli_hexdump_block(buffer, 64, 4, 16);
+       scal_cipher_free(&ctx);
+       key[0] = 0x20;
+       scal_cipher_init(&trivium_desc, key, 80, iv, 32, &ctx);
+       scal_cipher_gen_fillblock(buffer, 64, &ctx);
+       cli_putstr_P(PSTR("\r\nTest:\r\n  Key     = "));
+       cli_hexdump(key, 10);
+       cli_putstr_P(PSTR("\r\n  IV      = "));
+       cli_hexdump(iv, 4);
+       cli_putstr_P(PSTR("\r\n  Cipher  = "));
+       cli_hexdump_block(buffer, 64, 4, 16);
+       scal_cipher_free(&ctx);
+       key[0] = 0x10;
+       scal_cipher_init(&trivium_desc, key, 80, iv, 32, &ctx);
+       scal_cipher_gen_fillblock(buffer, 64, &ctx);
+       cli_putstr_P(PSTR("\r\nTest:\r\n  Key     = "));
+       cli_hexdump(key, 10);
+       cli_putstr_P(PSTR("\r\n  IV      = "));
+       cli_hexdump(iv, 4);
+       cli_putstr_P(PSTR("\r\n  Cipher  = "));
+       cli_hexdump_block(buffer, 64, 4, 16);
+       scal_cipher_free(&ctx);
 }
 
 void testrun_performance_trivium(void){
@@ -81,43 +103,42 @@ void testrun_performance_trivium(void){
        startTimer(1);
        trivium_init(key, 80, iv, 80, &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);
        trivium_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");
+const char nessie_str[]      PROGMEM = "nessie";
+const char test_str[]        PROGMEM = "test";
+const char performance_str[] PROGMEM = "performance";
+const char echo_str[]        PROGMEM = "echo";
 
-       uart_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
-       uart_putstr(cipher_name);
-       uart_putstr_P(PSTR(")\r\nloaded and running\r\n"));
+const cmdlist_entry_t cmdlist[] PROGMEM = {
+       { nessie_str,      NULL, testrun_nessie_trivium},
+       { test_str,        NULL, testrun_trivium},
+       { performance_str, NULL, testrun_performance_trivium},
+       { echo_str,    (void*)1, (void_fpt)echo_ctrl},
+       { NULL,            NULL, NULL}
+};
 
-       PGM_P    u   = PSTR("nessie\0test\0performance\0");
-       void_fpt v[] = {testrun_nessie_trivium, testrun_nessie_trivium, testrun_performance_trivium};
+int main (void){
+    main_setup();
 
-       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");
-       }       
+    for(;;){
+        welcome_msg(algo_name);
+        cmd_interface(cmdlist);
+       }
 }