X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;ds=sidebyside;f=test_src%2Fmain-rabbit-test.c;h=ab7e34649b80d4e38843702c43bf9f8b4c894589;hb=e9e07569721b9e005d6b602e26a03e930e796577;hp=b60de60decc1d9941eb30d434f228eace58e614d;hpb=35dc9566e40c9f68fa216c70eaa6d5b0597448fe;p=avr-crypto-lib.git
diff --git a/test_src/main-rabbit-test.c b/test_src/main-rabbit-test.c
index b60de60..ab7e346 100644
--- a/test_src/main-rabbit-test.c
+++ b/test_src/main-rabbit-test.c
@@ -1,7 +1,7 @@
/* main-rabbit-test.c */
/*
This file is part of the AVR-Crypto-Lib.
- Copyright (C) 2006-2011 Daniel Otte (daniel.otte@rub.de)
+ 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
@@ -17,31 +17,22 @@
along with this program. If not, see .
*/
-
-#include "config.h"
-
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
#include "rabbit.h"
-#include "cli.h"
#include "performance_test.h"
#include "scal_rabbit.h"
#include "scal-basic.h"
#include "scal-nessie.h"
-#include
-#include
-#include
-
-char* algo_name = "Rabbit";
+const char *algo_name = "Rabbit";
/*****************************************************************************
* additional validation-functions *
*****************************************************************************/
-void test_vector(void* key, void* iv, const void* ref){
+void test_vector(void *key, void *iv, const void *ref){
rabbit_ctx_t ctx;
uint8_t fail=0;
cli_putstr_P(PSTR("\r\n testing with\r\n key: "));
@@ -60,12 +51,14 @@ void test_vector(void* key, void* iv, const void* ref){
cli_hexdump(ctx.buffer, 16);
}
ctx.buffer_idx=16;
+ rabbit_gen(&ctx);
if(!ref || (memcmp_P(ctx.buffer, ref, 16))!=0){
fail = 1;
cli_putstr_P(PSTR("\r\n S[0]: "));
cli_hexdump(ctx.buffer, 16);
}
ctx.buffer_idx=16;
+ rabbit_gen(&ctx);
if(!ref || (memcmp_P(ctx.buffer, ref, 16))!=0){
fail = 1;
cli_putstr_P(PSTR("\r\n S[0]: "));
@@ -212,7 +205,7 @@ 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_rabbit},
{ performance_str, NULL, testrun_performance_rabbit},
{ first_str, NULL, nessie_first},
@@ -222,15 +215,11 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
};
int main (void){
- DEBUG_INIT();
-
- 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);
+ main_setup();
+
+ for(;;){
+ welcome_msg(algo_name);
+ cmd_interface(cmdlist);
}
}