X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-noekeon-test.c;h=acd501d79d70cb320d7738043d3da02d94177d51;hb=052cd5b12044286abbb0076ecff6956a02ac9325;hp=ebe42f7324c2e4f90060288dfdd4f0c5a5f3efe9;hpb=17332291e15183d71d88ed868275e3cb53917180;p=avr-crypto-lib.git
diff --git a/test_src/main-noekeon-test.c b/test_src/main-noekeon-test.c
index ebe42f7..acd501d 100644
--- a/test_src/main-noekeon-test.c
+++ b/test_src/main-noekeon-test.c
@@ -1,6 +1,6 @@
/* main-noekeon-test.c */
/*
- This file is part of the This file is part of the AVR-Crypto-Lib.
+ This file is part of the AVR-Crypto-Lib.
Copyright (C) 2008 Daniel Otte (daniel.otte@rub.de)
This program is free software: you can redistribute it and/or modify
@@ -17,7 +17,7 @@
along with this program. If not, see .
*/
/*
- * serpent test-suit
+ * noekeon test-suit
*
*/
@@ -35,7 +35,7 @@
#include
#include
-char* cipher_name = "Noekeon";
+char* algo_name = "Noekeon";
/*****************************************************************************
* additional validation-functions *
@@ -45,8 +45,8 @@ void noekeon_genctx_dummy(uint8_t* key, uint16_t keysize, void* ctx){
}
void testrun_nessie_noekeon_indirect(void){
- char str[strlen(cipher_name)+10];
- strcpy(str, cipher_name);
+ char str[strlen(algo_name)+10];
+ strcpy(str, algo_name);
strcat(str, "-indirect");
nessie_bc_ctx.blocksize_B = 16;
@@ -65,8 +65,8 @@ void noekeon_genctx_dummy_direct(uint8_t* key, uint16_t keysize, void* ctx){
}
void testrun_nessie_noekeon_direct(void){
- char str[strlen(cipher_name)+10];
- strcpy(str, cipher_name);
+ char str[strlen(algo_name)+10];
+ strcpy(str, algo_name);
strcat(str, "-Direct");
nessie_bc_ctx.blocksize_B = 16;
@@ -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,55 +187,56 @@ 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 *
*****************************************************************************/
+const char nessie_str[] PROGMEM = "nessie";
+const char test_str[] PROGMEM = "test";
+const char direct_str[] PROGMEM = "direct";
+const char indirect_str[] PROGMEM = "indirect";
+const char performance_str[] PROGMEM = "performance";
+const char echo_str[] PROGMEM = "echo";
+
+cmdlist_entry_t cmdlist[] PROGMEM = {
+ { nessie_str, NULL, testrun_nessie_noekeon},
+ { test_str, NULL, testrun_stdtest_noekeon},
+ { direct_str, NULL, testrun_nessie_noekeon_direct},
+ { indirect_str, NULL, testrun_nessie_noekeon_indirect},
+ { performance_str, NULL, testrun_performance_noekeon},
+ { echo_str, (void*)1, (void_fpt)echo_ctrl},
+ { NULL, NULL, NULL}
+};
+
int main (void){
- char str[20];
DEBUG_INIT();
- uart_putstr("\r\n");
-
- uart_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
- uart_putstr(cipher_name);
- uart_putstr_P(PSTR(")\r\nloaded and running\r\n"));
-
- PGM_P u = PSTR("nessie\0test\0direct\0indirect\0performance\0");
- void_fpt v[] = {testrun_nessie_noekeon,
- testrun_stdtest_noekeon,
- testrun_nessie_noekeon_direct,
- testrun_nessie_noekeon_indirect,
- testrun_performance_noekeon};
-
- while(1){
- if (!getnextwordn(str,20)){DEBUG_S("DBG: W1\r\n"); goto error;}
- if(execcommand_d0_P(str, u, v)<0){
- uart_putstr_P(PSTR("\r\nunknown command\r\n"));
- }
- continue;
- error:
- uart_putstr("ERROR\r\n");
- }
+ cli_rx = uart_getc;
+ cli_tx = uart_putc;
+ for(;;){
+ 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);
+ }
}
-