X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-noekeon-test.c;h=47f9661521eb954539cb4726566f7f99d012cadb;hb=6483e60140be5fe4ab60de85cdf679fc0518dc99;hp=1907c5e800f65706a6af7c41394343d6c5f7ab4b;hpb=572b35bb7409fb362441e0812cb62eab9f2411f0;p=avr-crypto-lib.git

diff --git a/test_src/main-noekeon-test.c b/test_src/main-noekeon-test.c
index 1907c5e..47f9661 100644
--- a/test_src/main-noekeon-test.c
+++ b/test_src/main-noekeon-test.c
@@ -17,19 +17,21 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 /*
- * serpent test-suit
+ * noekeon test-suit
  * 
 */
 
 #include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
+
+#include "uart_i.h"
 #include "debug.h"
 
 #include <noekeon.h>
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
+#include "bcal-performance.h"
+#include "bcal_noekeon.h"
 
 #include <stdint.h>
 #include <string.h>
@@ -37,6 +39,11 @@
 
 char* algo_name = "Noekeon";
 
+const bcdesc_t* algolist[] PROGMEM = {
+	(bcdesc_t*)&noekeon_direct_desc,
+	(bcdesc_t*)&noekeon_indirect_desc,
+	NULL
+};
 /*****************************************************************************
  *  additional validation-functions											 *
  *****************************************************************************/
@@ -87,42 +94,42 @@ void testrun_nessie_noekeon(void){
 
 
 void testrun_stdtest_rundirect(void* data, void* key){
-	uart_putstr_P(PSTR("\r\n                     "));
-	uart_putstr_P(PSTR("k = "));
-	uart_hexdump(key,16);
+	cli_putstr_P(PSTR("\r\n                     "));
+	cli_putstr_P(PSTR("k = "));
+	cli_hexdump(key,16);
 	
-	uart_putstr_P(PSTR("\r\n                     "));
-	uart_putstr_P(PSTR("a = "));
-	uart_hexdump(data,16);
+	cli_putstr_P(PSTR("\r\n                     "));
+	cli_putstr_P(PSTR("a = "));
+	cli_hexdump(data,16);
 	
 	noekeon_enc(data, key);
-	uart_putstr_P(PSTR("\r\nafter NESSIEencrypt, b = "));
-	uart_hexdump(data,16);
+	cli_putstr_P(PSTR("\r\nafter NESSIEencrypt, b = "));
+	cli_hexdump(data,16);
 	
 	noekeon_dec(data, key);
-	uart_putstr_P(PSTR("\r\nafter NESSIEdecrypt, a?= "));
-	uart_hexdump(data,16);
-	uart_putstr_P(PSTR("\r\n"));
+	cli_putstr_P(PSTR("\r\nafter NESSIEdecrypt, a?= "));
+	cli_hexdump(data,16);
+	cli_putstr_P(PSTR("\r\n"));
 }
 
 void testrun_stdtest_runindirect(void* data, void* key){
 	noekeon_ctx_t ctx;
-	uart_putstr_P(PSTR("\r\n                     "));
-	uart_putstr_P(PSTR("k = "));
-	uart_hexdump(key,16);
+	cli_putstr_P(PSTR("\r\n                     "));
+	cli_putstr_P(PSTR("k = "));
+	cli_hexdump(key,16);
 	
-	uart_putstr_P(PSTR("\r\n                     "));
-	uart_putstr_P(PSTR("a = "));
-	uart_hexdump(data,16);
+	cli_putstr_P(PSTR("\r\n                     "));
+	cli_putstr_P(PSTR("a = "));
+	cli_hexdump(data,16);
 	noekeon_init(key, &ctx);
 	noekeon_enc(data, &ctx);
-	uart_putstr_P(PSTR("\r\nafter NESSIEencrypt, b = "));
-	uart_hexdump(data,16);
+	cli_putstr_P(PSTR("\r\nafter NESSIEencrypt, b = "));
+	cli_hexdump(data,16);
 	
 	noekeon_dec(data, &ctx);
-	uart_putstr_P(PSTR("\r\nafter NESSIEdecrypt, a?= "));
-	uart_hexdump(data,16);
-	uart_putstr_P(PSTR("\r\n"));
+	cli_putstr_P(PSTR("\r\nafter NESSIEdecrypt, a?= "));
+	cli_hexdump(data,16);
+	cli_putstr_P(PSTR("\r\n"));
 }
 
 void testrun_stdtest_noekeon(void){
@@ -130,7 +137,7 @@ void testrun_stdtest_noekeon(void){
 	uint8_t key3[16];
 	noekeon_ctx_t ctx;
 	
-	uart_putstr_P(PSTR("\r\nTest vectors for block cipher Noekeon in Indirect-Key Mode:\r\n"));
+	cli_putstr_P(PSTR("\r\nTest vectors for block cipher Noekeon in Indirect-Key Mode:\r\n"));
 	
 	memset(key,  0, 16);
 	memset(data, 0, 16);
@@ -151,7 +158,7 @@ void testrun_stdtest_noekeon(void){
 	noekeon_enc(data, &ctx);
 	testrun_stdtest_runindirect(data, key3);
 	
-	uart_putstr_P(PSTR("\r\nTest vectors for block cipher Noekeon in Direct-Key Mode:\r\n"));
+	cli_putstr_P(PSTR("\r\nTest vectors for block cipher Noekeon in Direct-Key Mode:\r\n"));
 	
 	memset(key,  0, 16);
 	memset(data, 0, 16);
@@ -173,39 +180,7 @@ void testrun_stdtest_noekeon(void){
 }
 
 void testrun_performance_noekeon(void){
-	uint64_t t;
-	char str[16];
-	uint8_t key[16], data[16];
-	noekeon_ctx_t ctx;
-	
-	calibrateTimer();
-	print_overhead();
-	
-	memset(key,  0, 16);
-	memset(data, 0, 16);
-	
-	startTimer(1);
-	noekeon_init(key, &ctx);
-	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tctx-gen time: "));
-	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);	
-	
-	startTimer(1);
-	noekeon_enc(data, &ctx);
-	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tencrypt time: "));
-	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);	
-	
-	startTimer(1);
-	noekeon_dec(data, &ctx);
-	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tdecrypt time: "));
-	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);
-	
-	uart_putstr_P(PSTR("\r\n"));
+	bcal_performance_multiple(algolist);
 }
 /*****************************************************************************
  *  main																	 *
@@ -230,13 +205,13 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 
 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);
 	}
 }