X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=rsa%2Frsa_basic.c;h=345668e0bbcd5ca50769e4255cd606e2ed7cc11d;hb=eb0cafe05ab4cdf60878dbd81e4ff3712d5150f2;hp=b0ef12b53c11f9dbc212f9d5eabcbbd1b602f828;hpb=997bf1010de28a0a7246b792254a1ec6a59d5d4d;p=avr-crypto-lib.git

diff --git a/rsa/rsa_basic.c b/rsa/rsa_basic.c
index b0ef12b..345668e 100644
--- a/rsa/rsa_basic.c
+++ b/rsa/rsa_basic.c
@@ -28,9 +28,10 @@
 
 #if DEBUG
 #include "cli.h"
+#include <stdio.h>
 #endif
 
-void rsa_enc(bigint_t* data, rsa_publickey_t* key){
+void rsa_enc(bigint_t *data, const rsa_publickey_t *key){
 /*
 	cli_putstr_P(PSTR("\r\n -->rsa_enc()\r\n m = "));
 	bigint_print_hex(data);
@@ -39,7 +40,7 @@ void rsa_enc(bigint_t* data, rsa_publickey_t* key){
 	cli_putstr_P(PSTR("\r\n n = "));
 	bigint_print_hex(key->modulus);
 */
-	bigint_expmod_u(data, data, key->exponent, key->modulus);
+	bigint_expmod_u(data, data, &key->exponent, &key->modulus);
 }
 
 /*
@@ -50,58 +51,119 @@ h = (m1 - m2) * qinv % p
 m = m2 + q * h
 */
 
-uint8_t rsa_dec_crt_mono(bigint_t* data, rsa_privatekey_t* key){
+uint8_t rsa_dec_crt_mono(bigint_t *data, const rsa_privatekey_t *key){
 	bigint_t m1, m2;
-	m1.wordv = malloc((key->modulus->length_B + 1) * sizeof(bigint_word_t));
-	m2.wordv = malloc(key->components[1]->length_B * sizeof(bigint_word_t));
+	m1.wordv = malloc((key->components[0].length_W /* + 1 */) * sizeof(bigint_word_t));
+	m2.wordv = malloc((key->components[1].length_W /* + 1 */) * sizeof(bigint_word_t));
 	if(!m1.wordv || !m2.wordv){
 #if DEBUG
-		cli_putstr_P(PSTR("\r\nERROR: OOM! (" __FILE__ ")"));
+		cli_putstr_P(PSTR("\r\nERROR: OOM!"));
 #endif
 		free(m1.wordv);
 		free(m2.wordv);
 		return 1;
 	}
 #if DEBUG
-		cli_putstr_P(PSTR("\r\nexp_mod a + b "));
+	cli_putstr_P(PSTR("\r\nDBG: expmod m1 ..."));
+	cli_putstr_P(PSTR("\r\nexpmod("));
+	bigint_print_hex(data);
+	cli_putc(',');
+	bigint_print_hex(&(key->components[2]));
+	cli_putc(',');
+	bigint_print_hex(&(key->components[0]));
+	cli_putstr_P(PSTR(") = "));
 #endif
-	bigint_expmod_u(&m1, data, key->components[2], key->components[0]);
-	bigint_expmod_u(&m2, data, key->components[3], key->components[1]);
+	bigint_expmod_u(&m1, data, &(key->components[2]), &(key->components[0]));
 #if DEBUG
-	cli_putstr_P(PSTR("[done] "));
+	bigint_print_hex(&m1);
+	cli_putstr_P(PSTR("expmod m2 ..."));
+	cli_putstr_P(PSTR("\r\nexpmod("));
+	bigint_print_hex(data);
+	cli_putc(',');
+	bigint_print_hex(&(key->components[3]));
+	cli_putc(',');
+	bigint_print_hex(&(key->components[1]));
+	cli_putstr_P(PSTR(") = "));
+#endif
+	bigint_expmod_u(&m2, data, &(key->components[3]), &(key->components[1]));
+#if DEBUG
+	bigint_print_hex(&m2);
+	cli_putstr_P(PSTR("\r\nDBG: sub ..."));
+	cli_putstr_P(PSTR("\r\nsub("));
+	bigint_print_hex(&m1);
+	cli_putc(',');
+	bigint_print_hex(&m2);
+	cli_putstr_P(PSTR(") = "));
 #endif
 	bigint_sub_s(&m1, &m1, &m2);
 #if DEBUG
-	cli_putstr_P(PSTR("[done2] "));
+	bigint_print_hex(&m1);
 #endif
 	while(BIGINT_NEG_MASK & m1.info){
 #if DEBUG
-		cli_putc(',');
+	cli_putstr_P(PSTR("\r\nDBG: adding "));
+	bigint_print_hex(&key->components[0]);
+	cli_putstr_P(PSTR("\r\nDBG: to "));
+	bigint_print_hex(&m1);
 #endif
-		bigint_add_s(&m1, &m1, key->components[0]);
+		bigint_add_s(&m1, &m1, &(key->components[0]));
 	}
 #if DEBUG
-		cli_putstr_P(PSTR("\r\nreduce_mul "));
+	cli_putstr_P(PSTR("\r\nDBG: reduce-mul ..."));
+	cli_putstr_P(PSTR("\r\nreduce("));
+	bigint_print_hex(&m1);
+	cli_putc(',');
+	bigint_print_hex(&(key->components[0]));
+	cli_putstr_P(PSTR(") = "));
 #endif
-	bigint_reduce(&m1, key->components[0]);
-	bigint_mul_u(&m1, &m1, key->components[4]);
+	bigint_reduce(&m1, &(key->components[0]));
 #if DEBUG
-		cli_putstr_P(PSTR("[done]"));
+	bigint_print_hex(&m1);
+	cli_putstr_P(PSTR("\r\nmul("));
+	bigint_print_hex(&m1);
+	cli_putc(',');
+	bigint_print_hex(&(key->components[4]));
+	cli_putstr_P(PSTR(") = "));
 #endif
-	bigint_reduce(&m1, key->components[0]);
-	bigint_mul_u(&m1, &m1, key->components[1]);
+	bigint_mul_u(data, &m1, &(key->components[4]));
 #if DEBUG
-		cli_putstr_P(PSTR(" [done]"));
+	bigint_print_hex(data);
+	cli_putstr_P(PSTR("\r\nreduce("));
+	bigint_print_hex(data);
+	cli_putc(',');
+	bigint_print_hex(&(key->components[0]));
+	cli_putstr_P(PSTR(") = "));
+#endif
+	bigint_reduce(data, &(key->components[0]));
+#if DEBUG
+	bigint_print_hex(data);
+	cli_putstr_P(PSTR("\r\nmul("));
+	bigint_print_hex(data);
+	cli_putc(',');
+	bigint_print_hex(&(key->components[1]));
+	cli_putstr_P(PSTR(") = "));
+#endif
+	bigint_mul_u(data, data, &(key->components[1]));
+#if DEBUG
+	bigint_print_hex(data);
+	cli_putstr_P(PSTR("\r\nadd("));
+	bigint_print_hex(data);
+	cli_putc(',');
+	bigint_print_hex(&m2);
+	cli_putstr_P(PSTR(") = "));
+#endif
+	bigint_add_u(data, data, &m2);
+#if DEBUG
+	bigint_print_hex(data);
 #endif
-	bigint_add_u(data, &m1, &m2);
-	free(m1.wordv);
 	free(m2.wordv);
+	free(m1.wordv);
 	return 0;
 }
 
-uint8_t rsa_dec(bigint_t* data, rsa_privatekey_t* key){
+uint8_t rsa_dec(bigint_t *data, const rsa_privatekey_t *key){
 	if(key->n == 1){
-		bigint_expmod_u(data, data, key->components[0], key->modulus);
+		bigint_expmod_u(data, data, &(key->components[0]), &key->modulus);
 		return 0;
 	}
 	if(key->n == 5){
@@ -117,29 +179,55 @@ uint8_t rsa_dec(bigint_t* data, rsa_privatekey_t* key){
 	return 2;
 }
 
-void rsa_os2ip(bigint_t* dest, const void* data, uint32_t length_B){
+void rsa_os2ip(bigint_t *dest, const void *data, uint32_t length_B){
+#if BIGINT_WORD_SIZE == 8
+	if(data){
+		memcpy(dest->wordv, data, length_B);
+	}
+	dest->length_W = length_B;
+#else
 	uint8_t off;
-	off = length_B % sizeof(bigint_word_t);
-	if(!data){
-		if(off){
+	off = (sizeof(bigint_word_t) - length_B % sizeof(bigint_word_t)) % sizeof(bigint_word_t);
+#if DEBUG
+	printf("\r\nDBG: off = 0x%02x", off);
+#endif
+	if (!data) {
+		if (off) {
 			dest->wordv = realloc(dest->wordv, length_B + sizeof(bigint_word_t) - off);
-			memmove((uint8_t*)dest->wordv+off, dest->wordv, length_B);
+			memmove((uint8_t*)dest->wordv + off, dest->wordv, length_B);
 			memset(dest->wordv, 0, off);
 		}
 	}else{
+		memcpy((uint8_t*)dest->wordv + off, data, length_B);
 		if(off){
-			memcpy((uint8_t*)dest->wordv + off, data, length_B);
-			memset(dest, 0, off);
-		}else{
-			memcpy(dest->wordv, data, length_B);
+			memset(dest->wordv, 0, off);
 		}
 	}
-	dest->length_B = (length_B + sizeof(bigint_word_t) - 1) / sizeof(bigint_word_t);
+	dest->length_W = (length_B + off) / sizeof(bigint_word_t);
+#if DEBUG
+	printf("\r\nDBG: dest->length_W = %u", dest->length_W);
+#endif
+#endif
+	dest->info = 0;
 	bigint_changeendianess(dest);
 	bigint_adjust(dest);
 }
 
-void rsa_i2osp(void* dest, bigint_t* src, uint16_t* out_length_B){
+void rsa_i2osp(void *dest, bigint_t *src, uint16_t *out_length_B){
+#if BIGINT_WORD_SIZE == 8
+	if(dest){
+		uint8_t *e = src->wordv + src->length_W;
+		uint16_t i;
+		for(i=src->length_W; i>0; --i){
+			*((uint8_t*)dest) = *--e;
+			dest = (uint8_t*)dest + 1;
+		}
+	}else{
+		bigint_changeendianess(src);
+	}
+
+	*out_length_B = src->length_W;
+#else
 	*out_length_B = bigint_get_first_set_bit(src) / 8 + 1;
 	if(dest){
 		uint16_t i;
@@ -157,5 +245,6 @@ void rsa_i2osp(void* dest, bigint_t* src, uint16_t* out_length_B){
 			memmove(src->wordv, (uint8_t*)src->wordv+off, *out_length_B);
 		}
 	}
+#endif
 }