X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;ds=sidebyside;f=rsa%2Frsaes_oaep.c;h=d13fea38ff5c7011a5629abbf3e95e5b28ac8d69;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hp=3057d9a7cb6b9af409d66adc64fdc0d84885a0eb;hpb=7715ef86b09869014eb5afd319e4acc2ce157b00;p=avr-crypto-lib.git

diff --git a/rsa/rsaes_oaep.c b/rsa/rsaes_oaep.c
index 3057d9a..d13fea3 100644
--- a/rsa/rsaes_oaep.c
+++ b/rsa/rsaes_oaep.c
@@ -2,7 +2,7 @@
 /* rsa_oaep.c */
 /*
     This file is part of the ARM-Crypto-Lib.
-    Copyright (C) 2006-2012 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
@@ -51,10 +51,10 @@ rsa_label_t rsa_oaep_default_label = {
 		0, NULL
 };
 
-uint8_t rsa_encrypt_oaep(void* dest, uint16_t* out_length,
-		              const void* src, uint16_t length_B,
-		              rsa_publickey_t* key, const rsa_oaep_parameter_t *p,
-		              const rsa_label_t* label, const void* seed){
+uint8_t rsa_encrypt_oaep(void *dest, uint16_t *out_length,
+		              const void *src, uint16_t length_B,
+		              rsa_publickey_t *key, const rsa_oaep_parameter_t *p,
+		              const rsa_label_t *label, const void *seed){
 
 	if(!p){
 		p = &rsa_oaep_default_parameter;
@@ -72,9 +72,9 @@ uint8_t rsa_encrypt_oaep(void* dest, uint16_t* out_length,
 	cli_putstr("\r\n buffer_len = ");
 	cli_hexdump_rev(&buffer_len, 2);
 	cli_putstr("\r\n modulus_len = ");
-	cli_hexdump_rev(&key->modulus.length_B, 2);
+	cli_hexdump_rev(&key->modulus.length_W, 2);
 #endif
-	uint8_t* buffer = (uint8_t*)dest;
+	uint8_t *buffer = (uint8_t*)dest;
 	uint8_t off;
 	/* the following needs some explanation:
 	 * off is the offset which is used for compensating the effect of
@@ -84,9 +84,9 @@ uint8_t rsa_encrypt_oaep(void* dest, uint16_t* out_length,
 			% (sizeof(bigint_word_t));
 	buffer += off;
     buffer_len -= off;
-	uint8_t* seed_buffer = buffer + 1;
+	uint8_t *seed_buffer = buffer + 1;
 	uint16_t db_len = buffer_len - hv_len - 1;
-	uint8_t* db = seed_buffer + hv_len;
+	uint8_t *db = seed_buffer + hv_len;
 	uint16_t maskbuffer_len = db_len>hv_len?db_len:hv_len;
 	uint8_t maskbuffer[maskbuffer_len];
 	bigint_t x;
@@ -121,7 +121,7 @@ uint8_t rsa_encrypt_oaep(void* dest, uint16_t* out_length,
 	cli_hexdump_block(dest, bigint_length_B(&key->modulus), 4, 16);
 #endif
 	x.info = 0;
-	x.length_B = key->modulus.length_B;
+	x.length_W = key->modulus.length_W;
 	x.wordv = dest;
 	bigint_adjust(&x);
 	rsa_os2ip(&x, NULL, bigint_length_B(&key->modulus));
@@ -140,10 +140,10 @@ uint8_t rsa_encrypt_oaep(void* dest, uint16_t* out_length,
 	return 0;
 }
 
-uint8_t rsa_decrypt_oaep(void* dest, uint16_t* out_length,
-		              const void* src, uint16_t length_B,
-		              rsa_privatekey_t* key, const rsa_oaep_parameter_t *p,
-		              const rsa_label_t* label, void* seed){
+uint8_t rsa_decrypt_oaep(void *dest, uint16_t *out_length,
+		              const void *src, uint16_t length_B,
+		              rsa_privatekey_t *key, const rsa_oaep_parameter_t *p,
+		              const rsa_label_t *label, void *seed){
 
 //	cli_putstr("\r\n -->rsa_decrypt_oaep()"); uart_flush(0);
 	if(!label){
@@ -170,7 +170,7 @@ uint8_t rsa_decrypt_oaep(void* dest, uint16_t* out_length,
 //	cli_putc('a'); uart_flush(0);
 
 	x.wordv = dest;
-	x.length_B = key->modulus.length_B;
+	x.length_W = key->modulus.length_W;
 	x.info = 0;
 	bigint_adjust(&x);