X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-bigint-test.c;h=00baffc69881027a4fc69db498ea235413f36ec1;hb=a45c328791dc391e6432051ee0c7972ef7fd8d9a;hp=608c91afe7b4a857685695568a2c3527ee828acd;hpb=d1181933dc28db92d787cf5604e2fc96ab0d8f9f;p=avr-crypto-lib.git

diff --git a/test_src/main-bigint-test.c b/test_src/main-bigint-test.c
index 608c91a..00baffc 100644
--- a/test_src/main-bigint-test.c
+++ b/test_src/main-bigint-test.c
@@ -21,23 +21,15 @@
  * 
 */
 
-#include "config.h"
-
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "noekeon.h"
 #include "noekeon_prng.h"
 #include "bigint.h"
 #include "bigint_io.h"
 
-#include "cli.h"
 #include "performance_test.h"
 
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-
 char* algo_name = "BigInt";
 
 /*****************************************************************************
@@ -104,12 +96,12 @@ void test_add_scale_bigint(void){
 	for(;;){
 		cli_putstr_P(PSTR("\r\nenter a:"));
 		if(bigint_read_hex_echo(&a)){
-			cli_putstr_P(PSTR("\r\n end add test"));
+			cli_putstr_P(PSTR("\r\n end add-scale test"));
 			return;
 		}
 		cli_putstr_P(PSTR("\r\nenter b:"));
 		if(bigint_read_hex_echo(&b)){
-			cli_putstr_P(PSTR("\r\n end add test"));
+			cli_putstr_P(PSTR("\r\n end add-scale test"));
 			return;
 		}
 		cli_putstr_P(PSTR("\r\nenter scale:"));
@@ -125,13 +117,6 @@ void test_add_scale_bigint(void){
 			return;
 		}
 	*/
-		cli_putstr_P(PSTR("\r\n "));
-		bigint_print_hex(&a);
-		cli_putstr_P(PSTR(" + "));
-		bigint_print_hex(&b);
-		cli_putstr_P(PSTR("<<8*"));
-		cli_hexdump_rev(&scale, 2);
-		cli_putstr_P(PSTR(" = "));
 		uint8_t *c_b;
 		c_b = malloc(((a.length_B>(b.length_B+scale))?a.length_B:(b.length_B+scale))+2);
 		if(c_b==NULL){
@@ -140,9 +125,16 @@ void test_add_scale_bigint(void){
 			free(b.wordv);
 			continue;
 		}
-		bigint_copy(&c, &a);
 		c.wordv = c_b;
+		bigint_copy(&c, &a);
 		bigint_add_scale_u(&c, &b, scale);
+		cli_putstr_P(PSTR("\r\n "));
+		bigint_print_hex(&a);
+		cli_putstr_P(PSTR(" + "));
+		bigint_print_hex(&b);
+		cli_putstr_P(PSTR("<<8*"));
+		cli_hexdump_rev(&scale, 2);
+		cli_putstr_P(PSTR(" = "));
 		bigint_print_hex(&c);
 		cli_putstr_P(PSTR("\r\n"));
 		free(a.wordv);
@@ -400,7 +392,7 @@ void test_mul_simple(void){
 
 // f4 b86a 2220 0774 437d 70e6 **2 = e9f00f29ca1c876a7a682bd1e04f6925caffd6660ea4
 /*
-uint8_t square_test_data[] PROGMEM = {
+const uint8_t square_test_data[] PROGMEM = {
 	0xA0, 0x3C, 0x23, 0x9F, 0x7A, 0xFC, 0x60, 0xEB, 0x96, 0xC2, 0xA8, 0xAC, 0xC3, 0xC9, 0x9E, 0xEC,
 	0x4A, 0xF0, 0x1C, 0xB2, 0x36, 0x68, 0xD6, 0x4D, 0x3E, 0x4F, 0x8E, 0x55, 0xEA, 0x52, 0x46, 0x68,
 	0x6E, 0x18, 0x88, 0x37, 0x03, 0x70, 0xBD, 0x01, 0x60, 0xE2, 0xD6, 0x12, 0xA0, 0x0E, 0xD2, 0x72,
@@ -515,7 +507,7 @@ const char quick_test_str[]       PROGMEM = "quick-test";
 const char performance_str[]      PROGMEM = "performance";
 const char echo_str[]             PROGMEM = "echo";
 
-cmdlist_entry_t cmdlist[] PROGMEM = {
+const cmdlist_entry_t cmdlist[] PROGMEM = {
 	{ add_test_str,         NULL, test_add_bigint               },
 	{ add_scale_test_str,   NULL, test_add_scale_bigint         },
 	{ mul_test_str,         NULL, test_mul_bigint               },
@@ -531,14 +523,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"));
+    main_setup();
+
+    for(;;){
+        welcome_msg(algo_name);
 		cmd_interface(cmdlist);
 	}
 }