fixing E-Mail-Address & Copyright

[avr-crypto-lib.git] / rsa / rsa_basic.c

diff --git a/rsa/rsa_basic.c b/rsa/rsa_basic.c
index fbdc80ba457ada443b03d8b84552c0ad8e9d9950..0b6fef624237e0393e568f4d0bf0982b982de2dd 100644 (file)
--- a/rsa/rsa_basic.c
+++ b/rsa/rsa_basic.c
@@ -1,7 +1,7 @@
 /* rsa_basic.c */
 /*
     This file is part of the ARM-Crypto-Lib.
-    Copyright (C) 2006-2011 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
@@ -28,9 +28,10 @@
 
 #if DEBUG
 #include "cli.h"
+#include <stdio.h>
 #endif
 
-void rsa_enc(bigint_t* data, const 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);
@@ -50,7 +51,7 @@ h = (m1 - m2) * qinv % p
 m = m2 + q * h
 */
 
-uint8_t rsa_dec_crt_mono(bigint_t* data, const 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->components[0].length_W /* + 1 */) * sizeof(bigint_word_t));
        m2.wordv = malloc((key->components[1].length_W /* + 1 */) * sizeof(bigint_word_t));
@@ -101,7 +102,7 @@ uint8_t rsa_dec_crt_mono(bigint_t* data, const rsa_privatekey_t* key){
        while(BIGINT_NEG_MASK & m1.info){
 #if DEBUG
        cli_putstr_P(PSTR("\r\nDBG: adding "));
-       bigint_print_hex(key->components[0]);
+       bigint_print_hex(&key->components[0]);
        cli_putstr_P(PSTR("\r\nDBG: to "));
        bigint_print_hex(&m1);
 #endif
@@ -160,7 +161,7 @@ uint8_t rsa_dec_crt_mono(bigint_t* data, const rsa_privatekey_t* key){
        return 0;
 }
 
-uint8_t rsa_dec(bigint_t* data, const 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);
                return 0;
@@ -178,7 +179,7 @@ uint8_t rsa_dec(bigint_t* data, const 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);
@@ -188,13 +189,12 @@ void rsa_os2ip(bigint_t* dest, const void* data, uint32_t length_B){
        uint8_t off;
        off = (sizeof(bigint_word_t) - length_B % sizeof(bigint_word_t)) % sizeof(bigint_word_t);
 #if DEBUG
-       cli_putstr_P(PSTR("\r\nDBG: off = 0x"));
-       cli_hexdump_byte(off);
+       printf("\r\nDBG: off = 0x%02x", off);
 #endif
-       if(!data){
-               if(off){
+       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{
@@ -205,8 +205,7 @@ void rsa_os2ip(bigint_t* dest, const void* data, uint32_t length_B){
        }
        dest->length_W = (length_B + off) / sizeof(bigint_word_t);
 #if DEBUG
-       cli_putstr_P(PSTR("\r\nDBG: dest->length_W = 0x"));
-       cli_hexdump_rev(&(dest->length_W), 2);
+       printf("\r\nDBG: dest->length_W = %u", dest->length_W);
 #endif
 #endif
        dest->info = 0;
@@ -214,7 +213,7 @@ void rsa_os2ip(bigint_t* dest, const void* data, uint32_t length_B){
        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;