/* main-noekeon-test.c */
/*
- This file is part of the This file is part of the AVR-Crypto-Lib.
- Copyright (C) 2008 Daniel Otte (daniel.otte@rub.de)
+ This file is part of the AVR-Crypto-Lib.
+ Copyright (C) 2006-2015 Daniel Otte (bg@nerilex.org)
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
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 "debug.h"
+#include "main-test-common.h"
-#include <noekeon.h>
-#include "nessie_bc_test.h"
-#include "cli.h"
+#include "noekeon.h"
+#include "bcal-nessie.h"
#include "performance_test.h"
+#include "bcal-performance.h"
+#include "bcal_noekeon.h"
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-
-char* cipher_name = "Noekeon";
+char *algo_name = "Noekeon";
+const bcdesc_t *const algolist[] PROGMEM = {
+ (bcdesc_t*)&noekeon_direct_desc,
+ (bcdesc_t*)&noekeon_indirect_desc,
+ NULL
+};
/*****************************************************************************
* additional validation-functions *
*****************************************************************************/
-void noekeon_genctx_dummy(uint8_t* key, uint16_t keysize, void* ctx){
- noekeon_init(key, ctx);
-}
-
-void testrun_nessie_noekeon_indirect(void){
- char str[strlen(cipher_name)+10];
- strcpy(str, cipher_name);
- strcat(str, "-indirect");
-
- nessie_bc_ctx.blocksize_B = 16;
- nessie_bc_ctx.keysize_b = 128;
- nessie_bc_ctx.name = str;
- nessie_bc_ctx.ctx_size_B = sizeof(noekeon_ctx_t);
- nessie_bc_ctx.cipher_enc = (nessie_bc_enc_fpt)noekeon_enc;
- nessie_bc_ctx.cipher_dec = (nessie_bc_dec_fpt)noekeon_dec;
- nessie_bc_ctx.cipher_genctx = (nessie_bc_gen_fpt)noekeon_genctx_dummy;
-
- nessie_bc_run();
-}
-
-void noekeon_genctx_dummy_direct(uint8_t* key, uint16_t keysize, void* ctx){
- memcpy(ctx, key, 16);
-}
-
-void testrun_nessie_noekeon_direct(void){
- char str[strlen(cipher_name)+10];
- strcpy(str, cipher_name);
- strcat(str, "-Direct");
-
- nessie_bc_ctx.blocksize_B = 16;
- nessie_bc_ctx.keysize_b = 128;
- nessie_bc_ctx.name = str;
- nessie_bc_ctx.ctx_size_B = sizeof(noekeon_ctx_t);
- nessie_bc_ctx.cipher_enc = (nessie_bc_enc_fpt)noekeon_enc;
- nessie_bc_ctx.cipher_dec = (nessie_bc_dec_fpt)noekeon_dec;
- nessie_bc_ctx.cipher_genctx = (nessie_bc_gen_fpt)noekeon_genctx_dummy_direct;
-
- nessie_bc_run();
-}
void testrun_nessie_noekeon(void){
- testrun_nessie_noekeon_direct();
- testrun_nessie_noekeon_indirect();
+ bcal_nessie_multiple(algolist);
}
-void testrun_stdtest_rundirect(void* data, void* key){
- uart_putstr_P(PSTR("\r\n "));
- uart_putstr_P(PSTR("k = "));
- uart_hexdump(key,16);
-
- uart_putstr_P(PSTR("\r\n "));
- uart_putstr_P(PSTR("a = "));
- uart_hexdump(data,16);
+void testrun_stdtest_rundirect(void *data, void *key){
+ cli_putstr_P(PSTR("\r\n "));
+ cli_putstr_P(PSTR("k = "));
+ cli_hexdump(key,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){
+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){
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);
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);
}
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 *
*****************************************************************************/
+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";
+
+const 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");
+ main_setup();
+
+ for(;;){
+ welcome_msg(algo_name);
+ cmd_interface(cmdlist);
}
-
}
-
projects / avr-crypto-lib.git / blobdiff