X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-aes128-test.c;h=72e06f6198bbcd0819395eb3ddbdbe79b810b255;hb=9e69044519495dad3e2f76fc7795e72390b79a45;hp=ce9468f1c4d65c1ec70904e67b3c32c7b744e96e;hpb=302f07c97444e2f5f5560dc2fd9af58d4b591d45;p=avr-crypto-lib.git

diff --git a/test_src/main-aes128-test.c b/test_src/main-aes128-test.c
index ce9468f..72e06f6 100644
--- a/test_src/main-aes128-test.c
+++ b/test_src/main-aes128-test.c
@@ -18,7 +18,7 @@
 */
 /*
  * AES-128 test-suit
- * 
+ *
 */
 
 #include "config.h"
@@ -27,17 +27,13 @@
 #include "debug.h"
 
 #include "aes/aes.h"
-#include "aes/aes128_enc.h"
-#include "aes/aes128_dec.h"
-#include "aes/aes_keyschedule.h"
-
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
-
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
+#include <avr/pgmspace.h>
 
 char* algo_name = "AES-128";
 
@@ -57,13 +53,13 @@ void testrun_nessie_aes(void){
 }
 
 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);
@@ -77,12 +73,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};
@@ -103,6 +99,7 @@ void testrun_testkey_aes128(void){
 void testrun_testkey_aes(void){
 	testrun_testkey_aes128();
 }
+
 /*****************************************************************************/
 
 void testrun_performance_aes128(void){
@@ -110,36 +107,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"));
 }
 
@@ -166,12 +163,12 @@ 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);