]> git.cryptolib.org Git - avr-crypto-lib.git/blobdiff - test_src/main-aes-test.c
new makefile and modified build process
[avr-crypto-lib.git] / test_src / main-aes-test.c
index ba0e09c5859fb4f498fbfb98efbf8f8ea95138d2..765411bf7594b6da3ec6bf5faa875983a706747c 100644 (file)
@@ -1,6 +1,6 @@
 /* main-aes-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
 
 #include "config.h"
 #include "serial-tools.h"
-#include "uart.h"
+#include "uart_i.h"
 #include "debug.h"
 
-#include "aes.h"
-#include "aes128_enc.h"
-#include "aes128_dec.h"
-#include "aes192_enc.h"
-#include "aes192_dec.h"
-#include "aes256_enc.h"
-#include "aes256_dec.h"
-#include "aes_keyschedule.h"
+#include "aes/aes.h"
+#include "aes/aes128_enc.h"
+#include "aes/aes128_dec.h"
+#include "aes/aes192_enc.h"
+#include "aes/aes192_dec.h"
+#include "aes/aes256_enc.h"
+#include "aes/aes256_dec.h"
+#include "aes/aes_keyschedule.h"
 
 #include "nessie_bc_test.h"
 #include "cli.h"
@@ -42,8 +42,9 @@
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
+#include <avr/pgmspace.h>
 
-char* cipher_name = "AES";
+char* algo_name = "AES";
 
 /*****************************************************************************
  *  additional validation-functions                                                                                     *
@@ -52,7 +53,7 @@ char* cipher_name = "AES";
 void testrun_nessie_aes(void){
        nessie_bc_ctx.blocksize_B =  16;
        nessie_bc_ctx.keysize_b   = 128;
-       nessie_bc_ctx.name        = cipher_name;
+       nessie_bc_ctx.name        = algo_name;
        nessie_bc_ctx.ctx_size_B  = sizeof(aes128_ctx_t);
        nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)aes128_enc;
        nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)aes128_dec;
@@ -83,13 +84,16 @@ void testrun_test_aes(void){
                             0xe0, 0x37, 0x07, 0x34 };
        aes128_ctx_t ctx;
        aes128_init(key, &ctx);
-       uart_putstr_P(PSTR("\r\n\r\n cipher test (FIPS 197):\r\n key:        "));
-       uart_hexdump(key, 16);
-       uart_putstr_P(PSTR("\r\n plaintext:  "));
-       uart_hexdump(data, 16);
+       cli_putstr_P(PSTR("\r\n\r\n cipher test (FIPS 197):\r\n key:        "));
+       cli_hexdump(key, 16);
+       cli_putstr_P(PSTR("\r\n plaintext:  "));
+       cli_hexdump(data, 16);
        aes128_enc(data, &ctx);
-       uart_putstr_P(PSTR("\r\n ciphertext: "));
-       uart_hexdump(data, 16);
+       cli_putstr_P(PSTR("\r\n ciphertext: "));
+       cli_hexdump(data, 16);
+       aes128_dec(data, &ctx);
+       cli_putstr_P(PSTR("\r\n plaintext:  "));
+       cli_hexdump(data, 16);
        
        
 }
@@ -102,14 +106,14 @@ void testrun_testkey_aes128(void){
        aes128_ctx_t ctx;
        uint8_t i;
        aes128_init(key, &ctx);
-       uart_putstr_P(PSTR("\r\n\r\n keyschedule test (FIPS 197):\r\n key:   "));
-       uart_hexdump(key, 16);
+       cli_putstr_P(PSTR("\r\n\r\n keyschedule test (FIPS 197):\r\n key:   "));
+       cli_hexdump(key, 16);
        for(i=0; i<11; ++i){
-               uart_putstr_P(PSTR("\r\n index: "));
-               uart_putc('0'+i/10);
-               uart_putc('0'+i%10);
-               uart_putstr_P(PSTR(" roundkey "));
-               uart_hexdump(ctx.key[i].ks, 16);
+               cli_putstr_P(PSTR("\r\n index: "));
+               cli_putc('0'+i/10);
+               cli_putc('0'+i%10);
+               cli_putstr_P(PSTR(" roundkey "));
+               cli_hexdump(ctx.key[i].ks, 16);
        }
 }
 
@@ -124,14 +128,14 @@ void testrun_testkey_aes192(void){
        uint8_t i;
        memset(&ctx, 0, sizeof(aes192_ctx_t));
        aes192_init(key, &ctx);
-       uart_putstr_P(PSTR("\r\n\r\n keyschedule test (FIPS 197):\r\n key:   "));
-       uart_hexdump(key, 24);
+       cli_putstr_P(PSTR("\r\n\r\n keyschedule test (FIPS 197):\r\n key:   "));
+       cli_hexdump(key, 24);
        for(i=0; i<13; ++i){
-               uart_putstr_P(PSTR("\r\n index: "));
-               uart_putc('0'+i/10);
-               uart_putc('0'+i%10);
-               uart_putstr_P(PSTR(" roundkey "));
-               uart_hexdump(ctx.key[i].ks, 16);
+               cli_putstr_P(PSTR("\r\n index: "));
+               cli_putc('0'+i/10);
+               cli_putc('0'+i%10);
+               cli_putstr_P(PSTR(" roundkey "));
+               cli_hexdump(ctx.key[i].ks, 16);
        }
 }
 
@@ -149,14 +153,14 @@ void testrun_testkey_aes256(void){
        uint8_t i;
        memset(&ctx, 0, sizeof(aes256_ctx_t));
        aes256_init(key, &ctx);
-       uart_putstr_P(PSTR("\r\n\r\n keyschedule test (FIPS 197):\r\n key:   "));
-       uart_hexdump(key, 32);
+       cli_putstr_P(PSTR("\r\n\r\n keyschedule test (FIPS 197):\r\n key:   "));
+       cli_hexdump(key, 32);
        for(i=0; i<15; ++i){
-               uart_putstr_P(PSTR("\r\n index: "));
-               uart_putc('0'+i/10);
-               uart_putc('0'+i%10);
-               uart_putstr_P(PSTR(" roundkey "));
-               uart_hexdump(ctx.key[i].ks, 16);
+               cli_putstr_P(PSTR("\r\n index: "));
+               cli_putc('0'+i/10);
+               cli_putc('0'+i%10);
+               cli_putstr_P(PSTR(" roundkey "));
+               cli_hexdump(ctx.key[i].ks, 16);
        }
 }
 
@@ -182,27 +186,27 @@ void testrun_performance_aes128(void){
        startTimer(1);
        aes128_init(key, &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);
        aes128_enc(data, &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);
        
        
        startTimer(1);
        aes128_dec(data, &ctx);
        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"));
 }
 
 
@@ -221,27 +225,27 @@ void testrun_performance_aes192(void){
        startTimer(1);
        aes192_init(key, &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);
        aes192_enc(data, &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);
        
        
        startTimer(1);
        aes192_dec(data, &ctx);
        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"));
 }
 
 
@@ -260,66 +264,68 @@ void testrun_performance_aes256(void){
        startTimer(1);
        aes256_init(key, &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);
        aes256_enc(data, &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);
        
        
        startTimer(1);
        aes256_dec(data, &ctx);
        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"));
 }
 
 void testrun_performance_aes(void){
-       uart_putstr_P(PSTR("\r\n -=AES Performance Test=-\r\n"));
-       uart_putstr_P(PSTR("\r\n       AES-128\r\n"));
+       cli_putstr_P(PSTR("\r\n -=AES Performance Test=-\r\n"));
+       cli_putstr_P(PSTR("\r\n       AES-128\r\n"));
        testrun_performance_aes128();
-       uart_putstr_P(PSTR("\r\n       AES-192\r\n"));
+       cli_putstr_P(PSTR("\r\n       AES-192\r\n"));
        testrun_performance_aes192();
-       uart_putstr_P(PSTR("\r\n       AES-256\r\n"));
+       cli_putstr_P(PSTR("\r\n       AES-256\r\n"));
        testrun_performance_aes256();
 }
 /*****************************************************************************
  *  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"));
+const char nessie_str[]      PROGMEM = "nessie";
+const char test_str[]        PROGMEM = "test";
+const char testkey_str[]     PROGMEM = "testkey";
+const char performance_str[] PROGMEM = "performance";
+const char echo_str[]        PROGMEM = "echo";
 
-       PGM_P    u   = PSTR("nessie\0test\0testkey\0performance\0");
-       void_fpt v[] = {testrun_nessie_aes, 
-                       testrun_test_aes, 
-                       testrun_testkey_aes, 
-                       testrun_performance_aes};
+cmdlist_entry_t cmdlist[] PROGMEM = {
+       { nessie_str,      NULL, testrun_nessie_aes },
+       { test_str,        NULL, testrun_test_aes},
+       { testkey_str,     NULL, testrun_testkey_aes},
+       { performance_str, NULL, testrun_performance_aes},
+       { 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);
+       }
 }