X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-bigint-test.c;h=b757f28f342e42882b02f871ecbfe0a414dd63d5;hb=cc26d167f796adaa33ca3cbec8016f7915b6033b;hp=5b65d9e51557d214aea6bb9864ce82b26bff253f;hpb=ca25e57ca6a74d6e26cad823d45fcc4604689fa1;p=avr-crypto-lib.git
diff --git a/test_src/main-bigint-test.c b/test_src/main-bigint-test.c
index 5b65d9e..b757f28 100644
--- 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,27 +17,19 @@
along with this program. If not, see .
*/
/*
- * base64 test-suit
+ * bigint test-suit
*
*/
-#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
-#include
-#include
-
char* algo_name = "BigInt";
/*****************************************************************************
@@ -80,7 +72,7 @@ void test_add_bigint(void){
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);
+ c_b = malloc(((a.length_W>b.length_W)?a.length_W:b.length_W)+2);
if(c_b==NULL){
cli_putstr_P(PSTR("\n\rERROR: Out of memory!"));
free(a.wordv);
@@ -97,6 +89,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_W>(b.length_W+scale))?a.length_W:(b.length_W+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"));
@@ -118,7 +164,7 @@ void test_mul_bigint(void){
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);
+ c_b = malloc((((a.length_W>b.length_W)?a.length_W:b.length_W)+1)*2);
if(c_b==NULL){
cli_putstr_P(PSTR("\n\rERROR: Out of memory!"));
free(a.wordv);
@@ -148,7 +194,7 @@ void test_square_bigint(void){
bigint_print_hex(&a);
cli_putstr_P(PSTR("**2 = "));
uint8_t *c_b;
- c_b = malloc(a.length_B*2);
+ c_b = malloc(a.length_W*2);
if(c_b==NULL){
cli_putstr_P(PSTR("\n\rERROR: Out of memory!"));
free(a.wordv);
@@ -214,7 +260,7 @@ void test_expmod_bigint(void){
cli_putstr_P(PSTR("\r\n end expmod test"));
return;
}
- d_b = malloc(c.length_B);
+ d_b = malloc(c.length_W);
if(d_b==NULL){
cli_putstr_P(PSTR("\n\rERROR: Out of memory!"));
free(a.wordv);
@@ -256,9 +302,9 @@ void test_gcdext_bigint(void){
cli_putstr_P(PSTR("\r\n end gcdext test"));
return;
}
- c.wordv = malloc((a.length_Bb.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((a.length_Wb.length_W)?a.length_W:b.length_W);
+ e.wordv = malloc(1+(a.length_W>b.length_W)?a.length_W:b.length_W);
cli_putstr_P(PSTR("\r\n gcdext( "));
bigint_print_hex(&a);
@@ -288,8 +334,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);
@@ -305,8 +351,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);
@@ -330,8 +376,8 @@ void test_mul_simple(void){
a.wordv=a_b;
b.wordv=b_b;
c.wordv=c_b;
- a.length_B = 8;
- b.length_B = 8;
+ a.length_W = 8;
+ b.length_W = 8;
a.info=0x80;
bigint_adjust(&a);
bigint_adjust(&b);
@@ -346,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,
@@ -372,7 +418,7 @@ void test_square_simple(void){
uint8_t c_b[22];
a.wordv=a_b;
c.wordv=c_b;
- a.length_B = 11;
+ a.length_W = 11;
a.info=0x00;
bigint_adjust(&a);
bigint_square(&c, &a);
@@ -390,11 +436,11 @@ void test_reduce_simple(void){
uint8_t b_b[2] = {0x52, 0x27};
uint8_t c_b[2];
a.wordv=a_b;
- a.length_B = 2;
+ a.length_W = 2;
a.info=0x00;
bigint_adjust(&a);
b.wordv=b_b;
- b.length_B = 2;
+ b.length_W = 2;
b.info=0x00;
bigint_adjust(&b);
c.wordv = c_b;
@@ -419,11 +465,11 @@ void test_gcdext_simple(void){
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.length_W = 5;
a.info=0x00;
bigint_adjust(&a);
b.wordv=b_b;
- b.length_B = 5;
+ b.length_W = 5;
b.info=0x00;
bigint_adjust(&b);
c.wordv = c_b;
@@ -451,6 +497,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 +507,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 },
@@ -475,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);
}
}