/* main-grain-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
*/
#include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
+
+#include "uart_i.h"
#include "debug.h"
#include "cli.h"
#include <stdint.h>
#include <string.h>
-char* cipher_name = "Grain";
+char* algo_name = "Grain";
/*****************************************************************************
* additional validation-functions *
nessie_stream_ctx.outsize_b = 8; /* actually unused */
nessie_stream_ctx.keysize_b = 80; /* this is the one we have refrence vectors for */
nessie_stream_ctx.ivsize_b = 64;
- nessie_stream_ctx.name = cipher_name;
+ nessie_stream_ctx.name = algo_name;
nessie_stream_ctx.ctx_size_B = sizeof(grain_ctx_t);
nessie_stream_ctx.cipher_genctx = (nessie_stream_genctx_fpt)grain_genctx_dummy;
nessie_stream_ctx.cipher_enc = (nessie_stream_genenc_fpt)grain_getbyte_dummy_rev;
/* 1 */
memset(key, 0, 10);
memset(iv, 0, 8);
- uart_putstr_P(PSTR("\r\n=== std test ==="));
- uart_putstr_P(PSTR("\r\n key: "));
- uart_hexdump(key, 10);
- uart_putstr_P(PSTR("\r\n iv: "));
- uart_hexdump(key, 8);
+ cli_putstr_P(PSTR("\r\n=== std test ==="));
+ cli_putstr_P(PSTR("\r\n key: "));
+ cli_hexdump(key, 10);
+ cli_putstr_P(PSTR("\r\n iv: "));
+ cli_hexdump(key, 8);
grain_init(key, iv, &ctx);
for(i=0; i<10; ++i){
out[i] = grain_getbyte_dummy(&ctx);
}
- uart_putstr_P(PSTR("\r\n out: "));
- uart_hexdump(out, 10);
+ cli_putstr_P(PSTR("\r\n out: "));
+ cli_hexdump(out, 10);
/* 2 */
for(i=0; i<8; ++i){
for(i=0; i<8; ++i){
iv[i] = i*0x22+1;
}
- uart_putstr_P(PSTR("\r\n\r\n key: "));
- uart_hexdump(key, 10);
- uart_putstr_P(PSTR("\r\n iv: "));
- uart_hexdump(key, 8);
+ cli_putstr_P(PSTR("\r\n\r\n key: "));
+ cli_hexdump(key, 10);
+ cli_putstr_P(PSTR("\r\n iv: "));
+ cli_hexdump(key, 8);
grain_init(key, iv, &ctx);
for(i=0; i<10; ++i){
out[i] = grain_getbyte_dummy(&ctx);
}
- uart_putstr_P(PSTR("\r\n out: "));
- uart_hexdump(out, 10);
+ cli_putstr_P(PSTR("\r\n out: "));
+ cli_hexdump(out, 10);
- uart_putstr_P(PSTR("\r\n\r\n"));
+ cli_putstr_P(PSTR("\r\n\r\n"));
}
void testrun_performance_grain(void){
startTimer(1);
grain_init(key, iv, &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);
grain_enc(&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);
- 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 performance_str[] PROGMEM = "performance";
+const char echo_str[] PROGMEM = "echo";
+
+cmdlist_entry_t cmdlist[] PROGMEM = {
+ { nessie_str, NULL, testrun_nessie_grain },
+ { test_str, NULL, testrun_std_grain},
+ { performance_str, NULL, testrun_performance_grain},
+ { 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\0performance\0");
- void_fpt v[] = {testrun_nessie_grain, testrun_std_grain, testrun_performance_grain};
-
- 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 = (cli_rx_fpt)uart0_getc;
+ cli_tx = (cli_tx_fpt)uart0_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);
+ }
}
-
-
-