X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-skipjack-test.c;h=b39eee4dcaa452029bc28864dbfbf97766acc28d;hb=22985930c9c2c610ae18e2d8df0f3ea78a082134;hp=48de3cf327ab1cd9bace25b7dd92039460681b7c;hpb=27f4804c185ae24b3b6367bb2fdb898d6692d0f6;p=avr-crypto-lib.git

diff --git a/test_src/main-skipjack-test.c b/test_src/main-skipjack-test.c
index 48de3cf..b39eee4 100644
--- a/test_src/main-skipjack-test.c
+++ b/test_src/main-skipjack-test.c
@@ -21,34 +21,25 @@
  * 
 */
 
-#include "config.h"
-
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "skipjack.h"
 #include "nessie_bc_test.h"
-#include "cli.h"
 #include "performance_test.h"
 #include "bcal-performance.h"
 #include "bcal-nessie.h"
 #include "bcal_skipjack.h"
 
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-
+char *algo_name = "Skipjack";
 
-char* algo_name = "Skipjack";
-
-const bcdesc_t* const algolist[] PROGMEM = {
+const bcdesc_t *const algolist[] PROGMEM = {
 	(bcdesc_t*)&skipjack_desc,
 	NULL
 };
 /*****************************************************************************
  *  additional validation-functions											 *
  *****************************************************************************/
-void skipjack_genctx_dummy(uint8_t* key, uint16_t keysize, void* ctx){
+void skipjack_genctx_dummy(uint8_t *key, uint16_t keysize, void *ctx){
 	memcpy(ctx, key, 10);
 }
 
@@ -61,7 +52,7 @@ void testrun_performance_skipjack(void){
 	bcal_performance_multiple(algolist);
 }
 
-int test_enc(const void* buffer, void* key){
+int test_enc(const void *buffer, void *key){
 	uint8_t data[8];
 	int r;
 	memcpy(data, buffer, 8);
@@ -113,7 +104,7 @@ void testrun_nist_vectors(void){
  *  self tests																 *
  *****************************************************************************/
 
-void testencrypt(uint8_t* block, uint8_t* key){
+void testencrypt(uint8_t *block, uint8_t *key){
 	cli_putstr("\r\n==testy-encrypt==\r\n key: ");
 	cli_hexdump(key,10);
 	cli_putstr("\r\n plain: ");
@@ -123,7 +114,7 @@ void testencrypt(uint8_t* block, uint8_t* key){
 	cli_hexdump(block,8);
 }
 
-void testdecrypt(uint8_t* block, uint8_t* key){
+void testdecrypt(uint8_t *block, uint8_t *key){
 	cli_putstr("\r\n==testy-decrypt==\r\n key: ");
 	cli_hexdump(key,10);
 	cli_putstr("\r\n crypt: ");
@@ -175,14 +166,10 @@ 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);
 	}
 }