X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;ds=sidebyside;f=test_src%2Fmain-rabbit-test.c;h=ab7e34649b80d4e38843702c43bf9f8b4c894589;hb=e9e07569721b9e005d6b602e26a03e930e796577;hp=02538316dd1ed9ed4d0c017c1e0ec66c3fd6415b;hpb=701cee0d98aab48dd3192c8cc7c77eb42581bc56;p=avr-crypto-lib.git
diff --git a/test_src/main-rabbit-test.c b/test_src/main-rabbit-test.c
index 0253831..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,33 +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
-
-#include
-
-const 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: "));
@@ -226,15 +215,11 @@ const 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);
}
}