]> git.cryptolib.org Git - avr-crypto-lib.git/blobdiff - test_src/main-aes-test.c
fixing bug in SHA1-C
[avr-crypto-lib.git] / test_src / main-aes-test.c
index 47ed45972a6d646f8d147156aec7c5a83a5805cf..71b6600a6dcee9f607c84d6649bd58df7f675226 100644 (file)
 */
 /*
  * AES test-suit
- * 
+ *
 */
 
 #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 "nessie_bc_test.h"
 #include "cli.h"
@@ -59,108 +52,108 @@ 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);
-       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);
-       uart_putstr_P(PSTR("\r\n plaintext:  "));
-       uart_hexdump(data, 16);
-       
-       
+       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};
        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);
        }
 }
 
 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;
        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);
        }
 }
 
 
 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;
        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);
        }
 }
 
@@ -176,37 +169,37 @@ 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();
-       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);
-       
-       uart_putstr_P(PSTR("\r\n"));
+       cli_putstr(str);
+
+       cli_putstr_P(PSTR("\r\n"));
 }
 
 
@@ -215,37 +208,37 @@ 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();
-       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);
-       
-       uart_putstr_P(PSTR("\r\n"));
+       cli_putstr(str);
+
+       cli_putstr_P(PSTR("\r\n"));
 }
 
 
@@ -254,46 +247,46 @@ 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();
-       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);
-       
-       uart_putstr_P(PSTR("\r\n"));
+       cli_putstr(str);
+
+       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();
 }
 /*****************************************************************************
@@ -314,17 +307,17 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
        { echo_str,    (void*)1, (void_fpt)echo_ctrl},
        { NULL,            NULL, NULL}
 };
+
 
 int main (void){
        DEBUG_INIT();
-       uart_putstr("\r\n");
-       cli_rx = uart_getc;
-       cli_tx = uart_putc;             
+
+       cli_rx = (cli_rx_fpt)uart0_getc;
+       cli_tx = (cli_tx_fpt)uart0_putc;
        for(;;){
-               uart_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
-               uart_putstr(algo_name);
-               uart_putstr_P(PSTR(")\r\nloaded and running\r\n"));
+               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);
        }
 }