X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=bigint%2Fbigint_io.c;h=5d444180ee5a10d5a305eeb1e637cd7d74c59206;hb=fb928c1c4c392b9e987631f84f1027af94e05beb;hp=bf3fca7def9f03666da7c34dbcb82d6ed26a5c1d;hpb=262edc3c040a073636f91af03f1b64030c5b1b31;p=arm-crypto-lib.git

diff --git a/bigint/bigint_io.c b/bigint/bigint_io.c
index bf3fca7..5d44418 100644
--- a/bigint/bigint_io.c
+++ b/bigint/bigint_io.c
@@ -24,7 +24,7 @@
 #include <string.h>
 
 void bigint_print_hex(const bigint_t* a){
-	if(a->length_B==0){
+	if(a->length_W==0){
 		cli_putc('0');
 		return;
 	}
@@ -32,18 +32,18 @@ void bigint_print_hex(const bigint_t* a){
 		cli_putc('-');
 	}
 //	cli_putc((a->info&BIGINT_NEG_MASK)?'-':'+'); /* print sign */
-/*	if(a->wordv[a->length_B-1]<0x10){
-		cli_putc(hexdigit_tab_uc[a->wordv[a->length_B-1]]);
-		cli_hexdump_rev(a->wordv, a->length_B-1);
+/*	if(a->wordv[a->length_W-1]<0x10){
+		cli_putc(hexdigit_tab_uc[a->wordv[a->length_W-1]]);
+		cli_hexdump_rev(a->wordv, a->length_W-1);
 	} else {
 */
-	//	cli_hexdump_rev(a->wordv, a->length_B*sizeof(bigint_word_t));
+	//	cli_hexdump_rev(a->wordv, a->length_W*sizeof(bigint_word_t));
 //	}
 	uint32_t idx;
 	uint8_t print_zero=0;
 	uint8_t *p,x,y;
-	p = (uint8_t*)&(a->wordv[a->length_B-1])+sizeof(bigint_word_t)-1;
-	for(idx=a->length_B*sizeof(bigint_word_t); idx>0; --idx){
+	p = (uint8_t*)&(a->wordv[a->length_W-1])+sizeof(bigint_word_t)-1;
+	for(idx = a->length_W * sizeof(bigint_word_t); idx > 0; --idx){
 		x = *p >> 4;
 		y = *p & 0xf;
 		if(x!=0 || print_zero!=0){
@@ -97,24 +97,24 @@ static uint16_t read_byte(void){
 uint8_t bigint_read_hex_echo(bigint_t* a){
 	uint16_t allocated=0;
 	uint8_t  shift4=0;
-	uint16_t  t;
-	a->length_B = 0;
+	uint16_t  t, idx = 0;
+	a->length_W = 0;
 	a->wordv = NULL;
 	a->info = 0;
 	for(;;){
-		if(allocated-a->length_B < 1){
+		if(allocated - idx < 1){
 			bigint_word_t *p;
-			p = realloc(a->wordv, allocated+=BLOCKSIZE);
+			p = realloc(a->wordv, allocated += BLOCKSIZE);
 			if(p==NULL){
 				cli_putstr("\r\nERROR: Out of memory!");
 				free(a->wordv);
 				return 0xff;
 			}
-			memset((uint8_t*)p+allocated-BLOCKSIZE, 0, BLOCKSIZE);
+			memset((uint8_t*)p + allocated - BLOCKSIZE, 0, BLOCKSIZE);
 			a->wordv=p;
 		}
 		t = read_byte();
-		if(a->length_B==0){
+		if(idx==0){
 			if(t&0x0400){
 				/* got minus */
 				a->info |= BIGINT_NEG_MASK;
@@ -128,11 +128,11 @@ uint8_t bigint_read_hex_echo(bigint_t* a){
 			}
 		}
 		if(t<=0x00ff){
-			((uint8_t*)(a->wordv))[a->length_B++] = (uint8_t)t;
+			((uint8_t*)(a->wordv))[idx++] = (uint8_t)t;
 		}else{
 			if(t&0x0200){
 				shift4 = 1;
-				((uint8_t*)(a->wordv))[a->length_B++] = (uint8_t)((t&0x0f)<<4);
+				((uint8_t*)(a->wordv))[idx++] = (uint8_t)((t&0x0f)<<4);
 			}
 			break;
 		}
@@ -140,20 +140,18 @@ uint8_t bigint_read_hex_echo(bigint_t* a){
 	/* we have to reverse the byte array */
 	uint8_t tmp;
 	uint8_t *p, *q;
+	a->length_W = (idx + sizeof(bigint_word_t)-1)/sizeof(bigint_word_t);
 	p = (uint8_t*)(a->wordv);
-	q = (uint8_t*)a->wordv+a->length_B-1;
+	q = (uint8_t*)a->wordv + idx - 1;
 	while(q>p){
 		tmp = *p;
 		*p = *q;
 		*q = tmp;
 		p++; q--;
 	}
-	a->length_B = (a->length_B+sizeof(bigint_word_t)-1)/sizeof(bigint_word_t);
+	bigint_adjust(a);
 	if(shift4){
-		bigint_adjust(a);
 		bigint_shiftright(a, 4);
-	}else{
-		bigint_adjust(a);
 	}
 	return 0;
 }