X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-bigint-test.c;h=f27e7d34f2b8781ce1842d9d101a87a8f26b7751;hb=73f474e8fea34667e788ff4ec24de552e9d1d9e8;hp=621e70f5a6d88bddf454cf89a9ce97ef18190634;hpb=85aee632b0799ce567b9df7a6d16f59ab1564b34;p=arm-crypto-lib.git

diff --git a/test_src/main-bigint-test.c b/test_src/main-bigint-test.c
index 621e70f..f27e7d3 100644
--- a/test_src/main-bigint-test.c
+++ b/test_src/main-bigint-test.c
@@ -1,6 +1,6 @@
 /* main-bigint-test.c */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2008, 2009, 2010  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
@@ -20,15 +20,7 @@
  * bigint test-suit
  * 
 */
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include "config.h"
-#include "cli.h"
-#include "dump.h"
-#include "uart_lowlevel.h"
-#include "sysclock.h"
-#include "hw_gptm.h"
+#include "main-test-common.h"
 
 #include "noekeon.h"
 #include "noekeon_prng.h"
@@ -39,14 +31,6 @@
 
 char* algo_name = "BigInt";
 
-void uart0_putc(char byte){
-	uart_putc(UART_0, byte);
-}
-
-char uart0_getc(void){
-	return uart_getc(UART_0);
-}
-
 /*****************************************************************************
  *  additional validation-functions											 *
  *****************************************************************************/
@@ -122,7 +106,7 @@ void test_add_scale_bigint(void){
 		cli_putstr("\r\nenter scale:");
 		{
 			char str[8];
-			cli_getsn_cecho(str, 7);
+			cli_getsn(str, 7);
 			scale = atoi(str);
 		}
 	/*
@@ -140,15 +124,15 @@ void test_add_scale_bigint(void){
 		cli_hexdump_rev(&scale, 2);
 		cli_putstr(" = ");
 		bigint_word_t *c_b;
-		c_b = malloc(((a.length_B>(b.length_B+scale))?a.length_B:(b.length_B+scale))*sizeof(bigint_word_t)+8);
+		c_b = malloc((((a.length_B>(b.length_B+scale))?a.length_B:(b.length_B+scale))+1)*sizeof(bigint_word_t));
 		if(c_b==NULL){
 			cli_putstr("\n\rERROR: Out of memory!");
 			free(a.wordv);
 			free(b.wordv);
 			continue;
 		}
-		bigint_copy(&c, &a);
 		c.wordv = c_b;
+		bigint_copy(&c, &a);
 		bigint_add_scale_u(&c, &b, scale);
 		bigint_print_hex(&c);
 		cli_putstr("\r\n");
@@ -538,22 +522,9 @@ const cmdlist_entry_t cmdlist[] = {
 };
 
 int main (void){
-	sysclk_set_freq(SYS_FREQ);
-	sysclk_mosc_verify_enable();
-	uart_init(UART_0, 115200, 8, UART_PARATY_NONE, UART_STOPBITS_ONE);
-	gptm_set_timer_32periodic(TIMER0);
-
-	cli_rx = uart0_getc;
-	cli_tx = uart0_putc;
-	
+	main_setup();
 	for(;;){
-		cli_putstr("\r\n\r\nARM-Crypto-Lib VS (");
-		cli_putstr(algo_name);
-		cli_putstr("; ");
-		cli_putstr(__DATE__);
-		cli_putc(' ');
-		cli_putstr(__TIME__);
-		cli_putstr(")\r\nloaded and running\r\n");
+		welcome_msg(algo_name);
 		cmd_interface(cmdlist);
 	}
 }