also from the length_B -> length_W migration

[arm-crypto-lib.git] / test_src / main-bigint-test.c

diff --git a/test_src/main-bigint-test.c b/test_src/main-bigint-test.c
index 4ec32eeaa3b17aa2df362b45a1a0f9f1f98ae078..e636b950707ae43da64ecd162d2a9c5df83a74d7 100644 (file)
--- 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"
@@ -37,20 +29,8 @@
 
 #include "performance_test.h"
 
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-
 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                                                                                     *
  *****************************************************************************/
@@ -91,7 +71,7 @@ void test_add_bigint(void){
                bigint_print_hex(&b);
                cli_putstr(" = ");
                bigint_word_t *c_b;
-               c_b = malloc(((a.length_B>b.length_B)?a.length_B:b.length_B)*sizeof(bigint_word_t)+8);
+               c_b = malloc(((a.length_W>b.length_W)?a.length_W:b.length_W)*sizeof(bigint_word_t)+8);
                if(c_b==NULL){
                        cli_putstr("\n\rERROR: Out of memory!");
                        free(a.wordv);
@@ -126,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);
                }
        /*
@@ -144,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_W>(b.length_W+scale))?a.length_W:(b.length_W+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");
@@ -183,7 +163,7 @@ void test_mul_bigint(void){
                bigint_print_hex(&b);
                cli_putstr(" = ");
                bigint_word_t *c_b;
-               c_b = malloc((((a.length_B>b.length_B)?a.length_B:b.length_B)+1)*2*sizeof(bigint_word_t));
+               c_b = malloc((((a.length_W>b.length_W)?a.length_W:b.length_W)+1)*2*sizeof(bigint_word_t));
                if(c_b==NULL){
                        cli_putstr("\n\rERROR: Out of memory!");
                        free(a.wordv);
@@ -213,7 +193,7 @@ void test_square_bigint(void){
                bigint_print_hex(&a);
                cli_putstr("**2 = ");
                bigint_word_t *c_b;
-               c_b = malloc(a.length_B*2*sizeof(bigint_word_t));
+               c_b = malloc(a.length_W*2*sizeof(bigint_word_t));
                if(c_b==NULL){
                        cli_putstr("\n\rERROR: Out of memory!");
                        free(a.wordv);
@@ -279,7 +259,7 @@ void test_expmod_bigint(void){
                        cli_putstr("\r\n end expmod test");
                        return;
                }
-               d_b = malloc(c.length_B*sizeof(bigint_word_t));
+               d_b = malloc(c.length_W*sizeof(bigint_word_t));
                if(d_b==NULL){
                        cli_putstr("\n\rERROR: Out of memory!");
                        free(a.wordv);
@@ -321,9 +301,9 @@ void test_gcdext_bigint(void){
                        cli_putstr("\r\n end gcdext test");
                        return;
                }
-               c.wordv = malloc(((a.length_B<b.length_B)?a.length_B:b.length_B)*sizeof(bigint_word_t));
-               d.wordv = malloc((1+(a.length_B>b.length_B)?a.length_B:b.length_B)*sizeof(bigint_word_t));
-               e.wordv = malloc((1+(a.length_B>b.length_B)?a.length_B:b.length_B)*sizeof(bigint_word_t));
+               c.wordv = malloc(((a.length_W<b.length_W)?a.length_W:b.length_W)*sizeof(bigint_word_t));
+               d.wordv = malloc((1+(a.length_W>b.length_W)?a.length_W:b.length_W)*sizeof(bigint_word_t));
+               e.wordv = malloc((1+(a.length_W>b.length_W)?a.length_W:b.length_W)*sizeof(bigint_word_t));
 
                cli_putstr("\r\n gcdext( ");
                bigint_print_hex(&a);
@@ -353,8 +333,8 @@ void test_simple(void){
        a.wordv=a_b;
        b.wordv=b_b;
        c.wordv=c_b;
-       a.length_B = 1;
-       b.length_B = 1;
+       a.length_W = 1;
+       b.length_W = 1;
        a_b[0] = 1;
        b_b[0] = 2;
        bigint_add_u(&c, &a, &b);
@@ -370,8 +350,8 @@ void test_mul_simple(void){
        a.wordv=a_b;
        b.wordv=b_b;
        c.wordv=c_b;
-       a.length_B = 5;
-       b.length_B = 5;
+       a.length_W = 5;
+       b.length_W = 5;
        bigint_adjust(&a);
        bigint_adjust(&b);
        bigint_mul_s(&c, &a, &b);
@@ -395,8 +375,8 @@ void test_mul_simple(void){
        a.wordv=(bigint_word_t*)a_b;
        b.wordv=(bigint_word_t*)b_b;
        c.wordv=(bigint_word_t*)c_b;
-       a.length_B = 8/sizeof(bigint_word_t);
-       b.length_B = 8/sizeof(bigint_word_t);
+       a.length_W = 8/sizeof(bigint_word_t);
+       b.length_W = 8/sizeof(bigint_word_t);
        a.info=0x80;
        bigint_adjust(&a);
        bigint_adjust(&b);
@@ -437,7 +417,7 @@ void test_square_simple(void){
        uint8_t c_b[24];
        a.wordv=(bigint_word_t*)a_b;
        c.wordv=(bigint_word_t*)c_b;
-       a.length_B = 12/sizeof(bigint_word_t);
+       a.length_W = 12/sizeof(bigint_word_t);
        a.info=0x00;
        bigint_adjust(&a);
        bigint_square(&c, &a);
@@ -455,11 +435,11 @@ void test_reduce_simple(void){
        uint8_t b_b[4] = {0x52, 0x27, 0x00, 0x00};
        uint8_t c_b[4];
        a.wordv=(bigint_word_t*)a_b;
-       a.length_B = 1;
+       a.length_W = 1;
        a.info=0x00;
        bigint_adjust(&a);
        b.wordv=(bigint_word_t*)b_b;
-       b.length_B = 1;
+       b.length_W = 1;
        b.info=0x00;
        bigint_adjust(&b);
        c.wordv = (bigint_word_t*)c_b;
@@ -484,11 +464,11 @@ void test_gcdext_simple(void){
        uint8_t b_b[8] = {0x72, 0x7D, 0x57, 0xAC, 0X6F, 0x00, 0x00, 0x00};
        uint8_t c_b[16], d_b[16], e_b[16];
        a.wordv=(bigint_word_t*)a_b;
-       a.length_B = 2;
+       a.length_W = 2;
        a.info=0x00;
        bigint_adjust(&a);
        b.wordv=(bigint_word_t*)b_b;
-       b.length_B = 2;
+       b.length_W = 2;
        b.info=0x00;
        bigint_adjust(&b);
        c.wordv = (bigint_word_t*)c_b;
@@ -542,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);
        }
 }