X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-trivium-test.c;h=bee2710cf82ca8a08d56ab0ac8287334f5a6c435;hb=13dbf0a84670c266c122cb5dcd084b394ce30804;hp=13d00d7e872f9ab95ae0fe76bc9fbebe00085413;hpb=572b35bb7409fb362441e0812cb62eab9f2411f0;p=avr-crypto-lib.git
diff --git a/test_src/main-trivium-test.c b/test_src/main-trivium-test.c
index 13d00d7..bee2710 100644
--- a/test_src/main-trivium-test.c
+++ b/test_src/main-trivium-test.c
@@ -17,53 +17,75 @@
along with this program. If not, see .
*/
/*
- * Mickey128 test-suit
+ * Trivium test-suit
*
*/
-#include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
-#include "debug.h"
-#include "cli.h"
+#include "main-test-common.h"
#include "trivium.h"
-#include "nessie_stream_test.h"
+#include "scal_trivium.h"
+#include "scal-basic.h"
+#include "scal-nessie.h"
#include "performance_test.h"
-#include
-#include
-#include
-
char* algo_name = "Trivium";
/*****************************************************************************
* additional validation-functions *
*****************************************************************************/
-void trivium_genctx_dummy(uint8_t* key, uint16_t keysize_b, void* ctx){
- uint32_t iv=0;
- trivium_init(key, 80, &iv, 32, ctx);
-}
-uint8_t trivium_getbyte_dummy(trivium_ctx_t* ctx){
- uint8_t i,ret=0;
- for(i=0; i<8; ++i){
- ret<<=1;
- ret |= trivium_enc(ctx);
- }
- return ret;
+void testrun_nessie_trivium(void){
+ scal_nessie_run(&trivium_desc);
}
-void testrun_nessie_trivium(void){
- 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 = 32;
- nessie_stream_ctx.name = algo_name;
- nessie_stream_ctx.ctx_size_B = sizeof(trivium_ctx_t);
- nessie_stream_ctx.cipher_genctx = (nessie_stream_genctx_fpt)trivium_genctx_dummy;
- nessie_stream_ctx.cipher_enc = (nessie_stream_genenc_fpt)trivium_getbyte_dummy;
-
- nessie_stream_run();
+void testrun_trivium(void){
+ uint8_t key[10];
+ uint8_t iv[4];
+ uint8_t buffer[64];
+ scgen_ctx_t ctx;
+ memset(key, 0, 10);
+ memset(iv, 0, 4);
+ key[0] = 0x80;
+ scal_cipher_init(&trivium_desc, key, 80, iv, 32, &ctx);
+ scal_cipher_gen_fillblock(buffer, 64, &ctx);
+ cli_putstr_P(PSTR("\r\nTest:\r\n Key = "));
+ cli_hexdump(key, 10);
+ cli_putstr_P(PSTR("\r\n IV = "));
+ cli_hexdump(iv, 4);
+ cli_putstr_P(PSTR("\r\n Cipher = "));
+ cli_hexdump_block(buffer, 64, 4, 16);
+ scal_cipher_free(&ctx);
+ key[0] = 0x40;
+ scal_cipher_init(&trivium_desc, key, 80, iv, 32, &ctx);
+ scal_cipher_gen_fillblock(buffer, 64, &ctx);
+ cli_putstr_P(PSTR("\r\nTest:\r\n Key = "));
+ cli_hexdump(key, 10);
+ cli_putstr_P(PSTR("\r\n IV = "));
+ cli_hexdump(iv, 4);
+ cli_putstr_P(PSTR("\r\n Cipher = "));
+ cli_hexdump_block(buffer, 64, 4, 16);
+ scal_cipher_free(&ctx);
+ key[0] = 0x20;
+ scal_cipher_init(&trivium_desc, key, 80, iv, 32, &ctx);
+ scal_cipher_gen_fillblock(buffer, 64, &ctx);
+ cli_putstr_P(PSTR("\r\nTest:\r\n Key = "));
+ cli_hexdump(key, 10);
+ cli_putstr_P(PSTR("\r\n IV = "));
+ cli_hexdump(iv, 4);
+ cli_putstr_P(PSTR("\r\n Cipher = "));
+ cli_hexdump_block(buffer, 64, 4, 16);
+ scal_cipher_free(&ctx);
+ key[0] = 0x10;
+ scal_cipher_init(&trivium_desc, key, 80, iv, 32, &ctx);
+ scal_cipher_gen_fillblock(buffer, 64, &ctx);
+ cli_putstr_P(PSTR("\r\nTest:\r\n Key = "));
+ cli_hexdump(key, 10);
+ cli_putstr_P(PSTR("\r\n IV = "));
+ cli_hexdump(iv, 4);
+ cli_putstr_P(PSTR("\r\n Cipher = "));
+ cli_hexdump_block(buffer, 64, 4, 16);
+ scal_cipher_free(&ctx);
}
void testrun_performance_trivium(void){
@@ -81,18 +103,18 @@ void testrun_performance_trivium(void){
startTimer(1);
trivium_init(key, 80, iv, 80, &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);
trivium_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"));
}
/*****************************************************************************
@@ -104,23 +126,19 @@ const char test_str[] PROGMEM = "test";
const char performance_str[] PROGMEM = "performance";
const char echo_str[] PROGMEM = "echo";
-cmdlist_entry_t cmdlist[] PROGMEM = {
+const cmdlist_entry_t cmdlist[] PROGMEM = {
{ nessie_str, NULL, testrun_nessie_trivium},
- { test_str, NULL, testrun_nessie_trivium},
+ { test_str, NULL, testrun_trivium},
{ performance_str, NULL, testrun_performance_trivium},
{ echo_str, (void*)1, (void_fpt)echo_ctrl},
{ NULL, NULL, NULL}
};
int main (void){
- DEBUG_INIT();
- uart_putstr("\r\n");
- cli_rx = uart_getc;
- cli_tx = uart_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"));
- cmd_interface(cmdlist);
+ main_setup();
+
+ for(;;){
+ welcome_msg(algo_name);
+ cmd_interface(cmdlist);
}
}