X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-aes256-test.c;h=d75fc526bcde4bf4126b1cc09f1cd0c091a760a1;hb=6483e60140be5fe4ab60de85cdf679fc0518dc99;hp=d800b7f5a4ec45dcb72649d12e05f78be519d78a;hpb=079e93231b2a1227137399f064f13914938b2f67;p=avr-crypto-lib.git

diff --git a/test_src/main-aes256-test.c b/test_src/main-aes256-test.c
index d800b7f..d75fc52 100644
--- a/test_src/main-aes256-test.c
+++ b/test_src/main-aes256-test.c
@@ -18,18 +18,15 @@
 */
 /*
  * AES-256 test-suit
- * 
+ *
 */
 
 #include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
+
+#include "uart_i.h"
 #include "debug.h"
 
-#include "aes.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"
@@ -57,13 +54,13 @@ void testrun_nessie_aes(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;
@@ -90,36 +87,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"));
 }
 
@@ -150,9 +147,9 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 
 int main (void){
 	DEBUG_INIT();
-	
-	cli_rx = uart_getc;
-	cli_tx = uart_putc;	 	
+
+	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);