fixing some warnings (AES); simplifyning AES headers (now simply include "aes.h"...

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

diff --git a/test_src/main-skipjack-test.c b/test_src/main-skipjack-test.c
index a7f1165c697fa97bd0ccac0e9cea178b657ed47a..c37f2bc16680ee787405f8109a66536a1e15667d 100644 (file)
--- a/test_src/main-skipjack-test.c
+++ b/test_src/main-skipjack-test.c
@@ -1,6 +1,6 @@
 /* main-skipjack-test.c */
 /*
-    This file is part of the Crypto-avr-lib/microcrypt-lib.
+    This file is part of the AVR-Crypto-Lib.
     Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
@@ -22,8 +22,8 @@
 */
 
 #include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
+
+#include "uart_i.h"
 #include "debug.h"
 
 #include "skipjack.h"
@@ -36,7 +36,7 @@
 #include <stdlib.h>
 
 
-char* cipher_name = "Skipjack";
+char* algo_name = "Skipjack";
 
 /*****************************************************************************
  *  additional validation-functions                                                                                     *
@@ -48,7 +48,7 @@ void skipjack_genctx_dummy(uint8_t* key, uint16_t keysize, void* ctx){
 void testrun_nessie_skipjack(void){
        nessie_bc_ctx.blocksize_B =   8;
        nessie_bc_ctx.keysize_b   =  80;
-       nessie_bc_ctx.name        = cipher_name;
+       nessie_bc_ctx.name        = algo_name;
        nessie_bc_ctx.ctx_size_B  = 10;
        nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)skipjack_enc;
        nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)skipjack_dec;
@@ -72,19 +72,19 @@ void testrun_performance_skipjack(void){
        startTimer(1);
        skipjack_enc(data, key);
        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);
        
        
        startTimer(1);
        skipjack_dec(data, key);
        t = stopTimer();
-       uart_putstr_P(PSTR("\r\n\tdecrypt time: "));
+       cli_putstr_P(PSTR("\r\n\tdecrypt 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"));
 }
 
 /*****************************************************************************
@@ -92,31 +92,43 @@ void testrun_performance_skipjack(void){
  *****************************************************************************/
 
 void testencrypt(uint8_t* block, uint8_t* key){
-       uart_putstr("\r\n==testy-encrypt==\r\n key: ");
-       uart_hexdump(key,10);
-       uart_putstr("\r\n plain: ");
-       uart_hexdump(block,8);
+       cli_putstr("\r\n==testy-encrypt==\r\n key: ");
+       cli_hexdump(key,10);
+       cli_putstr("\r\n plain: ");
+       cli_hexdump(block,8);
        skipjack_enc(block,key);
-       uart_putstr("\r\n crypt: ");
-       uart_hexdump(block,8);
+       cli_putstr("\r\n crypt: ");
+       cli_hexdump(block,8);
 }
 
 void testdecrypt(uint8_t* block, uint8_t* key){
-       uart_putstr("\r\n==testy-decrypt==\r\n key: ");
-       uart_hexdump(key,10);
-       uart_putstr("\r\n crypt: ");
-       uart_hexdump(block,8);
+       cli_putstr("\r\n==testy-decrypt==\r\n key: ");
+       cli_hexdump(key,10);
+       cli_putstr("\r\n crypt: ");
+       cli_hexdump(block,8);
        skipjack_dec(block,key);
-       uart_putstr("\r\n plain: ");
-       uart_hexdump(block,8);
+       cli_putstr("\r\n plain: ");
+       cli_hexdump(block,8);
 }
 
 void testrun_skipjack(void){
-       uint8_t key[]={ 0x00, 0x99, 0x88, 0x77, 0x66,
-                                       0x55, 0x44, 0x33, 0x22, 0x11};
-       uint8_t data[]={ 0x33, 0x22, 0x11, 0x00, 0xdd, 0xcc, 0xbb, 0xaa};
-       testencrypt(data,key);
-       testdecrypt(data,key);  
+       uint8_t key[2][10]={
+                            { 0x00, 0x99, 0x88, 0x77, 0x66,
+                              0x55, 0x44, 0x33, 0x22, 0x11 },
+                            { 0x11, 0x22, 0x33, 0x44, 0x55,
+                              0x66, 0x77, 0x88, 0x99, 0x00 }
+                                          };   
+                        
+       uint8_t data[2][8]={
+                                { 0x33, 0x22, 0x11, 0x00, 
+                                  0xdd, 0xcc, 0xbb, 0xaa },
+                                { 0xaa, 0xbb, 0xcc, 0xdd,
+                                  0x00, 0x11, 0x22, 0x33 }
+                                          };
+       testencrypt(data[0],key[0]);
+       testdecrypt(data[0],key[0]);
+       testencrypt(data[1],key[1]);
+       testdecrypt(data[1],key[1]);    
 }
 
 
@@ -125,26 +137,28 @@ void testrun_skipjack(void){
  *  main                                                                                                                                        *
  *****************************************************************************/
 
-int main (void){
-       char str[20];
-
-       DEBUG_INIT();
-       uart_putstr("\r\n");
-
-       uart_putstr("\r\n\r\nCrypto-VS (skipjack)\r\nloaded and running\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";
 
-       PGM_P    u   = PSTR("nessie\0test\0performance\0");
-       void_fpt v[] = {testrun_nessie_skipjack, testrun_skipjack, testrun_performance_skipjack};
+cmdlist_entry_t cmdlist[] PROGMEM = {
+       { nessie_str,      NULL, testrun_nessie_skipjack},
+       { test_str,        NULL, testrun_skipjack},
+       { performance_str, NULL, testrun_performance_skipjack},
+       { echo_str,    (void*)1, (void_fpt)echo_ctrl},
+       { NULL,            NULL, NULL}
+};
 
-       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");
-       }
+int main (void){
+       DEBUG_INIT();
        
+       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);
+               cli_putstr_P(PSTR(")\r\nloaded and running\r\n"));
+               cmd_interface(cmdlist);
+       }
 }
-