]> git.cryptolib.org Git - avr-crypto-lib.git/blobdiff - test_src/main-bigint-test.c
fixing E-Mail-Address & Copyright
[avr-crypto-lib.git] / test_src / main-bigint-test.c
index 8fd41365ad308d2d4882c05b73849262b5cff4ce..19ef467f3f08925c52c8cc2f7dd77e07d4f47f84 100644 (file)
@@ -1,7 +1,7 @@
 /* main-bigint-test.c */
 /*
     This file is part of the AVR-Crypto-Lib.
-    Copyright (C) 2008, 2009, 2010  Daniel Otte (daniel.otte@rub.de)
+    Copyright (C) 2006-2015 Daniel Otte (bg@nerilex.org)
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
  * 
 */
 
-#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";
 
-char* algo_name = "BigInt";
+#define MAX(a,b) ((a) > (b) ? (a) : (b))
+#define MIN(a,b) ((a) < (b) ? (a) : (b))
 
 /*****************************************************************************
  *  additional validation-functions                                                                                     *
  *****************************************************************************/
-void test_echo_bigint(void){
+void test_echo_bigint(void) {
        bigint_t a;
        cli_putstr_P(PSTR("\r\necho test\r\n"));
-       for(;;){
+       for (;;) {
                cli_putstr_P(PSTR("\r\nenter hex number:"));
-               if(bigint_read_hex_echo(&a)){
+               if (bigint_read_hex_echo(&a)) {
                        cli_putstr_P(PSTR("\r\n end echo test"));
                        return;
                }
@@ -62,14 +57,14 @@ void test_echo_bigint(void){
 void test_add_bigint(void){
        bigint_t a, b, c;
        cli_putstr_P(PSTR("\r\nadd test\r\n"));
-       for(;;){
+       for (;;) {
                cli_putstr_P(PSTR("\r\nenter a:"));
-               if(bigint_read_hex_echo(&a)){
+               if (bigint_read_hex_echo(&a)) {
                        cli_putstr_P(PSTR("\r\n end add test"));
                        return;
                }
                cli_putstr_P(PSTR("\r\nenter b:"));
-               if(bigint_read_hex_echo(&b)){
+               if (bigint_read_hex_echo(&b)) {
                        free(a.wordv);
                        cli_putstr_P(PSTR("\r\n end add test"));
                        return;
@@ -79,9 +74,9 @@ void test_add_bigint(void){
                cli_putstr_P(PSTR(" + "));
                bigint_print_hex(&b);
                cli_putstr_P(PSTR(" = "));
-               uint8_t *c_b;
-               c_b = malloc(((a.length_B>b.length_B)?a.length_B:b.length_B)+2);
-               if(c_b==NULL){
+               bigint_word_t *c_b;
+               c_b = malloc((MAX(a.length_W, b.length_W) + 2) * sizeof(bigint_word_t));
+               if(c_b == NULL){
                        cli_putstr_P(PSTR("\n\rERROR: Out of memory!"));
                        free(a.wordv);
                        free(b.wordv);
@@ -97,17 +92,71 @@ void test_add_bigint(void){
        }
 }
 
+void test_add_scale_bigint(void){
+       bigint_t a, b, c;
+       uint16_t scale;
+       cli_putstr_P(PSTR("\r\nadd-scale test\r\n"));
+       for (;;) {
+               cli_putstr_P(PSTR("\r\nenter a:"));
+               if (bigint_read_hex_echo(&a)) {
+                       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-scale test"));
+                       return;
+               }
+               cli_putstr_P(PSTR("\r\nenter scale:"));
+               {
+                       char str[8];
+                       cli_getsn_cecho(str, 7);
+                       scale = atoi(str);
+               }
+       /*
+               if(bigint_read_hex_echo(&scale)){
+                       free(scale.wordv);
+                       cli_putstr_P(PSTR("\r\n end add test"));
+                       return;
+               }
+       */
+               bigint_word_t *c_b;
+               c_b = malloc((MAX(a.length_W, b.length_W+scale) + 2) * sizeof(bigint_word_t));
+               if(c_b==NULL){
+                       cli_putstr_P(PSTR("\n\rERROR: Out of memory!"));
+                       free(a.wordv);
+                       free(b.wordv);
+                       continue;
+               }
+               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);
+               free(b.wordv);
+               free(c_b);
+       }
+}
+
 void test_mul_bigint(void){
        bigint_t a, b, c;
        cli_putstr_P(PSTR("\r\nmul test\r\n"));
-       for(;;){
+       for (;;) {
                cli_putstr_P(PSTR("\r\nenter a:"));
-               if(bigint_read_hex_echo(&a)){
+               if (bigint_read_hex_echo(&a)) {
                        cli_putstr_P(PSTR("\r\n end mul test"));
                        return;
                }
                cli_putstr_P(PSTR("\r\nenter b:"));
-               if(bigint_read_hex_echo(&b)){
+               if (bigint_read_hex_echo(&b)) {
                        free(a.wordv);
                        cli_putstr_P(PSTR("\r\n end mul test"));
                        return;
@@ -117,9 +166,9 @@ void test_mul_bigint(void){
                cli_putstr_P(PSTR(" * "));
                bigint_print_hex(&b);
                cli_putstr_P(PSTR(" = "));
-               uint8_t *c_b;
-               c_b = malloc((((a.length_B>b.length_B)?a.length_B:b.length_B)+1)*2);
-               if(c_b==NULL){
+               bigint_word_t *c_b;
+               c_b = malloc((MAX(a.length_W, b.length_W) + 1) * 2 * sizeof(bigint_word_t));
+               if (c_b==NULL) {
                        cli_putstr_P(PSTR("\n\rERROR: Out of memory!"));
                        free(a.wordv);
                        free(b.wordv);
@@ -135,6 +184,99 @@ void test_mul_bigint(void){
        }
 }
 
+void test_mul_mont_bigint(void){
+    bigint_t a, b, c, a_, b_, m_, res;
+    bigint_length_t s;
+    cli_putstr_P(PSTR("\r\nmul-mont test ( (a * b) % c )\r\n"));
+    for (;;) {
+        cli_putstr_P(PSTR("\r\nenter a:"));
+        if (bigint_read_hex_echo(&a)) {
+            cli_putstr_P(PSTR("\r\n end mul test"));
+            return;
+        }
+        cli_putstr_P(PSTR("\r\nenter b:"));
+        if (bigint_read_hex_echo(&b)) {
+            free(a.wordv);
+            cli_putstr_P(PSTR("\r\n end mul test"));
+            return;
+        }
+        cli_putstr_P(PSTR("\r\nenter c:"));
+        if (bigint_read_hex_echo(&c)) {
+            free(a.wordv);
+            free(b.wordv);
+            cli_putstr_P(PSTR("\r\n end mul test"));
+            return;
+        }
+        s = c.length_W;
+        cli_putstr_P(PSTR("\r\n ("));
+        bigint_print_hex(&a);
+        cli_putstr_P(PSTR(" * "));
+        bigint_print_hex(&b);
+        cli_putstr_P(PSTR(") % "));
+        bigint_print_hex(&c);
+        cli_putstr_P(PSTR(" = "));
+        bigint_word_t res_w[s], a_w_[s], b_w_[s], m_w_[s + 1];
+        res.wordv = res_w;
+        a_.wordv = a_w_;
+        b_.wordv = b_w_;
+        m_.wordv = m_w_;
+        bigint_mont_gen_m_(&m_, &c);
+        bigint_mont_trans(&a_, &a, &c);
+        bigint_mont_trans(&b_, &b, &c);
+        bigint_mont_mul(&res, &a_, &b_, &c, &m_);
+        bigint_mont_red(&res, &res, &c, &m_);
+        bigint_print_hex(&res);
+        putchar('\n');
+        free(a.wordv);
+        free(b.wordv);
+        free(c.wordv);
+    }
+}
+
+void test_mul_word_bigint(void){
+    bigint_t a, b;
+    bigint_word_t *t;
+    cli_putstr_P(PSTR("\r\nmul test\r\n"));
+    for (;;) {
+        cli_putstr_P(PSTR("\r\nenter a:"));
+        if (bigint_read_hex_echo(&a)) {
+            cli_putstr_P(PSTR("\r\n end mul test"));
+            return;
+        }
+        cli_putstr_P(PSTR("\r\nenter b:"));
+        if (bigint_read_hex_echo(&b)) {
+            free(a.wordv);
+            cli_putstr_P(PSTR("\r\n end mul test"));
+            return;
+        }
+        cli_putstr_P(PSTR("\r\n "));
+        bigint_print_hex(&a);
+        cli_putstr_P(PSTR(" * "));
+        bigint_print_hex(&b);
+        cli_putstr_P(PSTR(" = "));
+
+        if (b.length_W > 1) {
+            free(a.wordv);
+            free(b.wordv);
+            cli_putstr_P(PSTR("\r\n end mul test"));
+        }
+
+        t = realloc(a.wordv, (a.length_W + 3) * sizeof(bigint_word_t));
+        if (t == NULL) {
+            cli_putstr_P(PSTR("\n\rERROR: Out of memory!"));
+            free(a.wordv);
+            free(b.wordv);
+            continue;
+        }
+        a.wordv = t;
+        bigint_mul_word_u(&a, b.wordv[0]);
+        bigint_print_hex(&a);
+        cli_putstr_P(PSTR("\r\n"));
+        free(a.wordv);
+        free(b.wordv);
+    }
+}
+
 void test_square_bigint(void){
        bigint_t a, c;
        cli_putstr_P(PSTR("\r\nsquare test\r\n"));
@@ -147,9 +289,9 @@ void test_square_bigint(void){
                cli_putstr_P(PSTR("\r\n "));
                bigint_print_hex(&a);
                cli_putstr_P(PSTR("**2 = "));
-               uint8_t *c_b;
-               c_b = malloc(a.length_B*2);
-               if(c_b==NULL){
+               bigint_word_t *c_b;
+               c_b = malloc(a.length_W * 2 * sizeof(bigint_word_t));
+               if(c_b == NULL){
                        cli_putstr_P(PSTR("\n\rERROR: Out of memory!"));
                        free(a.wordv);
                        continue;
@@ -166,14 +308,14 @@ void test_square_bigint(void){
 void test_reduce_bigint(void){
        bigint_t a, b;
        cli_putstr_P(PSTR("\r\nreduce test\r\n"));
-       for(;;){
+       for (;;) {
                cli_putstr_P(PSTR("\r\nenter a:"));
-               if(bigint_read_hex_echo(&a)){
+               if (bigint_read_hex_echo(&a)) {
                        cli_putstr_P(PSTR("\r\n end reduce test"));
                        return;
                }
                cli_putstr_P(PSTR("\r\nenter b:"));
-               if(bigint_read_hex_echo(&b)){
+               if (bigint_read_hex_echo(&b)) {
                        free(a.wordv);
                        cli_putstr_P(PSTR("\r\n end reduce test"));
                        return;
@@ -193,28 +335,28 @@ void test_reduce_bigint(void){
 /* d = a**b % c */
 void test_expmod_bigint(void){
        bigint_t a, b, c, d;
-       uint8_t *d_b;
-       cli_putstr_P(PSTR("\r\nreduce test\r\n"));
-       for(;;){
+       bigint_word_t *d_b;
+       cli_putstr_P(PSTR("\r\nexpnonentiation-modulo test\r\n"));
+       for (;;) {
                cli_putstr_P(PSTR("\r\nenter a:"));
-               if(bigint_read_hex_echo(&a)){
+               if (bigint_read_hex_echo(&a)) {
                        cli_putstr_P(PSTR("\r\n end expmod test"));
                        return;
                }
                cli_putstr_P(PSTR("\r\nenter b:"));
-               if(bigint_read_hex_echo(&b)){
+               if (bigint_read_hex_echo(&b)) {
                        free(a.wordv);
                        cli_putstr_P(PSTR("\r\n end expmod test"));
                        return;
                }
                cli_putstr_P(PSTR("\r\nenter c:"));
-               if(bigint_read_hex_echo(&c)){
+               if (bigint_read_hex_echo(&c)) {
                        free(a.wordv);
                        free(b.wordv);
                        cli_putstr_P(PSTR("\r\n end expmod test"));
                        return;
                }
-               d_b = malloc(c.length_B);
+               d_b = malloc(c.length_W * sizeof(bigint_word_t));
                if(d_b==NULL){
                        cli_putstr_P(PSTR("\n\rERROR: Out of memory!"));
                        free(a.wordv);
@@ -230,7 +372,7 @@ void test_expmod_bigint(void){
                cli_putstr_P(PSTR(" % "));
                bigint_print_hex(&c);
                cli_putstr_P(PSTR(" = "));
-               bigint_expmod_u(&d, &a, &b, &c);
+               bigint_expmod_u_sam(&d, &a, &b, &c);
                bigint_print_hex(&d);
                cli_putstr_P(PSTR("\r\n"));
                free(a.wordv);
@@ -241,24 +383,75 @@ void test_expmod_bigint(void){
        }
 }
 
+/* d = a**b % c */
+void test_expmod_mont_bigint(void){
+    bigint_t a, b, c, d;
+    bigint_word_t *d_b;
+    cli_putstr_P(PSTR("\r\nexpnonentiation-modulo-montgomory test\r\n"));
+    for (;;) {
+        cli_putstr_P(PSTR("\r\nenter a:"));
+        if (bigint_read_hex_echo(&a)) {
+            cli_putstr_P(PSTR("\r\n end expmod test"));
+            return;
+        }
+        cli_putstr_P(PSTR("\r\nenter b:"));
+        if (bigint_read_hex_echo(&b)) {
+            free(a.wordv);
+            cli_putstr_P(PSTR("\r\n end expmod test"));
+            return;
+        }
+        cli_putstr_P(PSTR("\r\nenter c:"));
+        if (bigint_read_hex_echo(&c)) {
+            free(a.wordv);
+            free(b.wordv);
+            cli_putstr_P(PSTR("\r\n end expmod test"));
+            return;
+        }
+        d_b = malloc(c.length_W * sizeof(bigint_word_t));
+        if (d_b == NULL) {
+            cli_putstr_P(PSTR("\n\rERROR: Out of memory!"));
+            free(a.wordv);
+            free(b.wordv);
+            free(c.wordv);
+            continue;
+        }
+        d.wordv = d_b;
+        cli_putstr_P(PSTR("\r\n "));
+        bigint_print_hex(&a);
+        cli_putstr_P(PSTR("**"));
+        bigint_print_hex(&b);
+        cli_putstr_P(PSTR(" % "));
+        bigint_print_hex(&c);
+        cli_putstr_P(PSTR(" = "));
+        bigint_expmod_u_mont_sam(&d, &a, &b, &c);
+        bigint_print_hex(&d);
+        cli_putstr_P(PSTR("\r\n"));
+        free(a.wordv);
+        free(b.wordv);
+        free(c.wordv);
+        free(d.wordv);
+
+    }
+}
+
 void test_gcdext_bigint(void){
        bigint_t a, b, c, d, e;
        cli_putstr_P(PSTR("\r\ngcdext test\r\n"));
-       for(;;){
+       for (;;) {
                cli_putstr_P(PSTR("\r\nenter a:"));
-               if(bigint_read_hex_echo(&a)){
+               if (bigint_read_hex_echo(&a)) {
                        cli_putstr_P(PSTR("\r\n end gcdext test"));
                        return;
                }
                cli_putstr_P(PSTR("\r\nenter b:"));
-               if(bigint_read_hex_echo(&b)){
+               if (bigint_read_hex_echo(&b)) {
                        free(a.wordv);
                        cli_putstr_P(PSTR("\r\n end gcdext test"));
                        return;
                }
-               c.wordv = malloc((a.length_B<b.length_B)?a.length_B:b.length_B);
-               d.wordv = malloc(1+(a.length_B>b.length_B)?a.length_B:b.length_B);
-               e.wordv = malloc(1+(a.length_B>b.length_B)?a.length_B:b.length_B);
+               c.wordv = malloc(MIN(a.length_W, b.length_W) * sizeof(bigint_word_t));
+               d.wordv = malloc((MAX(a.length_W, b.length_W) + 1) * sizeof(bigint_word_t));
+               e.wordv = malloc((MAX(a.length_W, b.length_W) + 1) * sizeof(bigint_word_t));
 
                cli_putstr_P(PSTR("\r\n gcdext( "));
                bigint_print_hex(&a);
@@ -284,12 +477,12 @@ void test_gcdext_bigint(void){
 
 void test_simple(void){
        bigint_t a, b, c;
-       uint8_t a_b[1], b_b[1], c_b[2];
-       a.wordv=a_b;
-       b.wordv=b_b;
-       c.wordv=c_b;
-       a.length_B = 1;
-       b.length_B = 1;
+       bigint_word_t a_b[1], b_b[1], c_b[2];
+       a.wordv = a_b;
+       b.wordv = b_b;
+       c.wordv = c_b;
+       a.length_W = 1;
+       b.length_W = 1;
        a_b[0] = 1;
        b_b[0] = 2;
        bigint_add_u(&c, &a, &b);
@@ -305,8 +498,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);
@@ -327,12 +520,12 @@ void test_mul_simple(void){
        uint8_t b_b[8] = {0xe6, 0xdd, 0xce, 0x00, 0x44, 0x60, 0xda, 0x0d};
 
        uint8_t c_b[16];
-       a.wordv=a_b;
-       b.wordv=b_b;
-       c.wordv=c_b;
-       a.length_B = 8;
-       b.length_B = 8;
-       a.info=0x80;
+       a.wordv = (bigint_word_t*)a_b;
+       b.wordv = (bigint_word_t*)b_b;
+       c.wordv = (bigint_word_t*)c_b;
+       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);
        bigint_mul_s(&c, &a, &b);
@@ -346,7 +539,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,
@@ -368,12 +561,12 @@ uint8_t square_test_data[] PROGMEM = {
 void test_square_simple(void){
        bigint_t a, c;
 
-       uint8_t a_b[11] = {0xe6, 0x70, 0x7d, 0x43, 0x74, 0x07, 0x20, 0x22, 0x6a, 0xb8, 0xf4};
-       uint8_t c_b[22];
-       a.wordv=a_b;
-       c.wordv=c_b;
-       a.length_B = 11;
-       a.info=0x00;
+       uint8_t a_b[16] = {0xe6, 0x70, 0x7d, 0x43, 0x74, 0x07, 0x20, 0x22, 0x6a, 0xb8, 0xf4, 0, 0, 0, 0, 0};
+       uint8_t c_b[32];
+       a.wordv = (bigint_word_t*)a_b;
+       c.wordv = (bigint_word_t*)c_b;
+       a.length_W = 16 / sizeof(bigint_word_t);
+       a.info = 0x00;
        bigint_adjust(&a);
        bigint_square(&c, &a);
        cli_putstr_P(PSTR("\r\n test: "));
@@ -386,18 +579,18 @@ void test_square_simple(void){
 void test_reduce_simple(void){
        bigint_t a, b, c;
 
-       uint8_t a_b[2] = {0x62, 0xA8};
-       uint8_t b_b[2] = {0x52, 0x27};
-       uint8_t c_b[2];
-       a.wordv=a_b;
-       a.length_B = 2;
-       a.info=0x00;
+       uint8_t a_b[4] = {0x62, 0xA8};
+       uint8_t b_b[4] = {0x52, 0x27};
+       uint8_t c_b[4];
+       a.wordv = (bigint_word_t*)a_b;
+       a.length_W = 4 / sizeof(bigint_word_t);
+       a.info = 0x00;
        bigint_adjust(&a);
-       b.wordv=b_b;
-       b.length_B = 2;
-       b.info=0x00;
+       b.wordv = (bigint_word_t*)b_b;
+       b.length_W = 4 / sizeof(bigint_word_t);
+       b.info = 0x00;
        bigint_adjust(&b);
-       c.wordv = c_b;
+       c.wordv = (bigint_word_t*)c_b;
        bigint_copy(&c, &a);
        bigint_reduce(&c, &b);
        cli_putstr_P(PSTR("\r\n test: "));
@@ -415,20 +608,20 @@ void test_reduce_simple(void){
 void test_gcdext_simple(void){
        bigint_t a, b, c, d, e;
 
-       uint8_t a_b[5] = {0x71, 0x07, 0x00, 0x09, 0x16};
-       uint8_t b_b[5] = {0x72, 0x7D, 0x57, 0xAC, 0X6F};
-       uint8_t c_b[6], d_b[6], e_b[6];
-       a.wordv=a_b;
-       a.length_B = 5;
-       a.info=0x00;
+       uint8_t a_b[8] = {0x71, 0x07, 0x00, 0x09, 0x16};
+       uint8_t b_b[8] = {0x72, 0x7D, 0x57, 0xAC, 0X6F};
+       uint8_t c_b[8], d_b[8], e_b[8];
+       a.wordv = (bigint_word_t*)a_b;
+       a.length_W = 8 / sizeof(bigint_word_t);
+       a.info = 0x00;
        bigint_adjust(&a);
-       b.wordv=b_b;
-       b.length_B = 5;
-       b.info=0x00;
+       b.wordv = (bigint_word_t*)b_b;
+       b.length_W = 8 / sizeof(bigint_word_t);
+       b.info = 0x00;
        bigint_adjust(&b);
-       c.wordv = c_b;
-       d.wordv = d_b;
-       e.wordv = e_b;
+       c.wordv = (bigint_word_t*)c_b;
+       d.wordv = (bigint_word_t*)d_b;
+       e.wordv = (bigint_word_t*)e_b;
        bigint_gcdext(&c, &d, &e, &a, &b);
        cli_putstr_P(PSTR("\r\n test: gcd( "));
        bigint_print_hex(&a);
@@ -451,21 +644,29 @@ void testrun_performance_bigint(void){
 
 const char echo_test_str[]        PROGMEM = "echo-test";
 const char add_test_str[]         PROGMEM = "add-test";
+const char add_scale_test_str[]   PROGMEM = "add-scale-test";
 const char mul_test_str[]         PROGMEM = "mul-test";
+const char mul_mont_test_str[]    PROGMEM = "mul-mont-test";
+const char mul_word_test_str[]    PROGMEM = "mul-word-test";
 const char square_test_str[]      PROGMEM = "square-test";
 const char reduce_test_str[]      PROGMEM = "reduce-test";
 const char expmod_test_str[]      PROGMEM = "expmod-test";
+const char expmod_mont_test_str[] PROGMEM = "expmod-mont-test";
 const char gcdext_test_str[]      PROGMEM = "gcdext-test";
 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               },
+    { mul_mont_test_str,    NULL, test_mul_mont_bigint          },
+    { mul_word_test_str,    NULL, test_mul_word_bigint          },
        { square_test_str,      NULL, test_square_bigint            },
        { reduce_test_str,      NULL, test_reduce_bigint            },
-       { expmod_test_str,      NULL, test_expmod_bigint            },
+    { expmod_test_str,      NULL, test_expmod_bigint            },
+    { expmod_mont_test_str, NULL, test_expmod_mont_bigint       },
        { gcdext_test_str,      NULL, test_gcdext_bigint            },
        { quick_test_str,       NULL, test_gcdext_simple            },
        { echo_test_str,        NULL, test_echo_bigint              },
@@ -475,14 +676,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);
        }
 }