X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-cscipher-test.c;h=0e96709fe53d61812b667d21f6a586686de9d274;hb=22985930c9c2c610ae18e2d8df0f3ea78a082134;hp=4de929a03ceacba8626ae91e563b23f91dc38536;hpb=548902530e99ffda615113aee335956ea92aab7c;p=avr-crypto-lib.git

diff --git a/test_src/main-cscipher-test.c b/test_src/main-cscipher-test.c
index 4de929a..0e96709 100644
--- a/test_src/main-cscipher-test.c
+++ b/test_src/main-cscipher-test.c
@@ -21,25 +21,17 @@
  * 
 */
 
-#include "config.h"
-
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "cscipher.h"
 #include "bcal-nessie.h"
-#include "cli.h"
 #include "performance_test.h"
 #include "bcal-performance.h"
 #include "bcal_cscipher.h"
 
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-
-char* algo_name = "CS-Cipher";
+char *algo_name = "CS-Cipher";
 
-const bcdesc_t* algolist[] PROGMEM = {
+const bcdesc_t *const algolist[] PROGMEM = {
 	(bcdesc_t*)&cscipher_desc,
 	NULL
 };
@@ -48,7 +40,7 @@ const bcdesc_t* algolist[] PROGMEM = {
  *  additional validation-functions											 *
  *****************************************************************************/
 
-void cscipher_init_dummy(const uint8_t* key, uint16_t keysize_b, void* ctx){
+void cscipher_init_dummy(const uint8_t *key, uint16_t keysize_b, void *ctx){
 	cscipher_init(key, ctx);
 }
 
@@ -138,7 +130,7 @@ const char longtest_str[]    PROGMEM = "longtest";
 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_cscipher },
 	{ test_str,        NULL, testrun_cscipher},
 	{ longtest_str,    NULL, testrun_long_cscipher},
@@ -148,14 +140,10 @@ 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);
 	}
 }