a lot of fixes

[avr-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 5b65d9e51557d214aea6bb9864ce82b26bff253f..8fef0fbc9236ba3ee180656b0b5f99c2f6b95c2c 100644 (file)
--- a/test_src/main-bigint-test.c
+++ b/test_src/main-bigint-test.c
@@ -1,7 +1,7 @@
-/* main-base64-test.c */
+/* main-bigint-test.c */
 /*
     This file is part of the AVR-Crypto-Lib.
-    Copyright (C) 2008, 2009  Daniel Otte (daniel.otte@rub.de)
+    Copyright (C) 2008, 2009, 2010  Daniel Otte (daniel.otte@rub.de)
 
     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
@@ -17,7 +17,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 /*
- * base64 test-suit
+ * bigint test-suit
  * 
 */
 
@@ -97,6 +97,60 @@ 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;
+               }
+       */
+               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){
+                       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"));
@@ -346,7 +400,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,
@@ -451,6 +505,7 @@ 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 square_test_str[]      PROGMEM = "square-test";
 const char reduce_test_str[]      PROGMEM = "reduce-test";
@@ -460,8 +515,9 @@ 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               },
        { square_test_str,      NULL, test_square_bigint            },
        { reduce_test_str,      NULL, test_reduce_bigint            },