X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;ds=inline;f=test_src%2Fmain-noekeon-test.c;h=fa0c3238cc035c7d5691b7252121e1fb2d813b61;hb=795fc6b98b4cb914fde7ed86c239a39e7db512e7;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..fa0c323 100644
--- a/test_src/main-noekeon-test.c
+++ b/test_src/main-noekeon-test.c
@@ -17,13 +17,13 @@
along with this program. If not, see .
*/
/*
- * serpent test-suit
+ * noekeon test-suit
*
*/
#include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
+
+#include "uart_i.h"
#include "debug.h"
#include
@@ -87,42 +87,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 +130,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 +151,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);
@@ -187,25 +187,25 @@ void testrun_performance_noekeon(void){
startTimer(1);
noekeon_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);
noekeon_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);
noekeon_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"));
}
/*****************************************************************************
* main *
@@ -230,13 +230,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);
}
}