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

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

diff --git a/test_src/main-aes-test.c b/test_src/main-aes-test.c
index e2d3685d6e0ec813dcac488e06053143b71a435f..71b6600a6dcee9f607c84d6649bd58df7f675226 100644 (file)
--- a/test_src/main-aes-test.c
+++ b/test_src/main-aes-test.c
@@ -18,7 +18,7 @@
 */
 /*
  * AES test-suit
- * 
+ *
 */
 
 #include "config.h"
@@ -27,13 +27,6 @@
 #include "debug.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"
@@ -59,28 +52,28 @@ void testrun_nessie_aes(void){
        nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)aes128_dec;
        nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)aes_init;
        nessie_bc_run();
-       
+
        nessie_bc_ctx.keysize_b   = 192;
        nessie_bc_ctx.ctx_size_B  = sizeof(aes192_ctx_t);
        nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)aes192_enc;
        nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)aes192_dec;
        nessie_bc_run();
-       
+
        nessie_bc_ctx.keysize_b   = 256;
        nessie_bc_ctx.ctx_size_B  = sizeof(aes256_ctx_t);
        nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)aes256_enc;
        nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)aes256_dec;
-       nessie_bc_run(); 
+       nessie_bc_run();
 }
 
 void testrun_test_aes(void){
-       uint8_t key[16] = { 0x2b, 0x7e, 0x15, 0x16, 
+       uint8_t key[16] = { 0x2b, 0x7e, 0x15, 0x16,
                            0x28, 0xae, 0xd2, 0xa6,
                            0xab, 0xf7, 0x15, 0x88,
                            0x09, 0xcf, 0x4f, 0x3c };
        uint8_t data[16] = { 0x32, 0x43, 0xf6, 0xa8,
-                            0x88, 0x5a, 0x30, 0x8d, 
-                            0x31, 0x31, 0x98, 0xa2, 
+                            0x88, 0x5a, 0x30, 0x8d,
+                            0x31, 0x31, 0x98, 0xa2,
                             0xe0, 0x37, 0x07, 0x34 };
        aes128_ctx_t ctx;
        aes128_init(key, &ctx);
@@ -94,12 +87,12 @@ void testrun_test_aes(void){
        aes128_dec(data, &ctx);
        cli_putstr_P(PSTR("\r\n plaintext:  "));
        cli_hexdump(data, 16);
-       
-       
+
+
 }
 
 void testrun_testkey_aes128(void){
-       uint8_t key[16] = { 0x2b, 0x7e, 0x15, 0x16, 
+       uint8_t key[16] = { 0x2b, 0x7e, 0x15, 0x16,
                            0x28, 0xae, 0xd2, 0xa6,
                            0xab, 0xf7, 0x15, 0x88,
                            0x09, 0xcf, 0x4f, 0x3c};
@@ -118,11 +111,11 @@ void testrun_testkey_aes128(void){
 }
 
 void testrun_testkey_aes192(void){
-       uint8_t key[24] = { 0x8e, 0x73, 0xb0, 0xf7, 
+       uint8_t key[24] = { 0x8e, 0x73, 0xb0, 0xf7,
                            0xda, 0x0e, 0x64, 0x52,
-                           0xc8, 0x10, 0xf3, 0x2b, 
-                           0x80, 0x90, 0x79, 0xe5, 
-                           0x62, 0xf8, 0xea, 0xd2, 
+                           0xc8, 0x10, 0xf3, 0x2b,
+                           0x80, 0x90, 0x79, 0xe5,
+                           0x62, 0xf8, 0xea, 0xd2,
                            0x52, 0x2c, 0x6b, 0x7b};
        aes192_ctx_t ctx;
        uint8_t i;
@@ -141,13 +134,13 @@ void testrun_testkey_aes192(void){
 
 
 void testrun_testkey_aes256(void){
-       uint8_t key[32] = { 0x60, 0x3d, 0xeb, 0x10, 
-                           0x15, 0xca, 0x71, 0xbe, 
-                           0x2b, 0x73, 0xae, 0xf0, 
-                           0x85, 0x7d, 0x77, 0x81, 
-                           0x1f, 0x35, 0x2c, 0x07, 
-                           0x3b, 0x61, 0x08, 0xd7, 
-                           0x2d, 0x98, 0x10, 0xa3, 
+       uint8_t key[32] = { 0x60, 0x3d, 0xeb, 0x10,
+                           0x15, 0xca, 0x71, 0xbe,
+                           0x2b, 0x73, 0xae, 0xf0,
+                           0x85, 0x7d, 0x77, 0x81,
+                           0x1f, 0x35, 0x2c, 0x07,
+                           0x3b, 0x61, 0x08, 0xd7,
+                           0x2d, 0x98, 0x10, 0xa3,
                            0x09, 0x14, 0xdf, 0xf4};
        aes256_ctx_t ctx;
        uint8_t i;
@@ -176,36 +169,36 @@ void testrun_performance_aes128(void){
        char str[16];
        uint8_t key[32], data[16];
        aes128_ctx_t ctx;
-       
+
        calibrateTimer();
        print_overhead();
-       
+
        memset(key,  0, 32);
        memset(data, 0, 16);
-       
+
        startTimer(1);
        aes128_init(key, &ctx);
        t = stopTimer();
        cli_putstr_P(PSTR("\r\n\tctx-gen time: "));
        ultoa((unsigned long)t, str, 10);
        cli_putstr(str);
-       
-       
+
+
        startTimer(1);
        aes128_enc(data, &ctx);
        t = stopTimer();
        cli_putstr_P(PSTR("\r\n\tencrypt time: "));
        ultoa((unsigned long)t, str, 10);
        cli_putstr(str);
-       
-       
+
+
        startTimer(1);
        aes128_dec(data, &ctx);
        t = stopTimer();
        cli_putstr_P(PSTR("\r\n\tdecrypt time: "));
        ultoa((unsigned long)t, str, 10);
        cli_putstr(str);
-       
+
        cli_putstr_P(PSTR("\r\n"));
 }
 
@@ -215,36 +208,36 @@ void testrun_performance_aes192(void){
        char str[16];
        uint8_t key[32], data[16];
        aes192_ctx_t ctx;
-       
+
        calibrateTimer();
        print_overhead();
-       
+
        memset(key,  0, 32);
        memset(data, 0, 16);
-       
+
        startTimer(1);
        aes192_init(key, &ctx);
        t = stopTimer();
        cli_putstr_P(PSTR("\r\n\tctx-gen time: "));
        ultoa((unsigned long)t, str, 10);
        cli_putstr(str);
-       
-       
+
+
        startTimer(1);
        aes192_enc(data, &ctx);
        t = stopTimer();
        cli_putstr_P(PSTR("\r\n\tencrypt time: "));
        ultoa((unsigned long)t, str, 10);
        cli_putstr(str);
-       
-       
+
+
        startTimer(1);
        aes192_dec(data, &ctx);
        t = stopTimer();
        cli_putstr_P(PSTR("\r\n\tdecrypt time: "));
        ultoa((unsigned long)t, str, 10);
        cli_putstr(str);
-       
+
        cli_putstr_P(PSTR("\r\n"));
 }
 
@@ -254,36 +247,36 @@ void testrun_performance_aes256(void){
        char str[16];
        uint8_t key[32], data[16];
        aes256_ctx_t ctx;
-       
+
        calibrateTimer();
        print_overhead();
-       
+
        memset(key,  0, 32);
        memset(data, 0, 16);
-       
+
        startTimer(1);
        aes256_init(key, &ctx);
        t = stopTimer();
        cli_putstr_P(PSTR("\r\n\tctx-gen time: "));
        ultoa((unsigned long)t, str, 10);
        cli_putstr(str);
-       
-       
+
+
        startTimer(1);
        aes256_enc(data, &ctx);
        t = stopTimer();
        cli_putstr_P(PSTR("\r\n\tencrypt time: "));
        ultoa((unsigned long)t, str, 10);
        cli_putstr(str);
-       
-       
+
+
        startTimer(1);
        aes256_dec(data, &ctx);
        t = stopTimer();
        cli_putstr_P(PSTR("\r\n\tdecrypt time: "));
        ultoa((unsigned long)t, str, 10);
        cli_putstr(str);
-       
+
        cli_putstr_P(PSTR("\r\n"));
 }
 
@@ -314,13 +307,13 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
        { echo_str,    (void*)1, (void_fpt)echo_ctrl},
        { NULL,            NULL, NULL}
 };
- 
+
 
 int main (void){
        DEBUG_INIT();
-       
+
        cli_rx = (cli_rx_fpt)uart0_getc;
-       cli_tx = (cli_tx_fpt)uart0_putc;                
+       cli_tx = (cli_tx_fpt)uart0_putc;
        for(;;){
                cli_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
                cli_putstr(algo_name);