#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"
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);
}
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);
}
}
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);
}
}
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);
}
}
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"));
}
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"));
}
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();
}
/*****************************************************************************
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);
}
}