X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fopenssl%2Frsa.c;h=986c98f24e20888524654fd0f8a4a1d979a60a04;hb=d917c8cb6b69475d568ccbe82389b9f2b3eb5e80;hp=17e8dbaf3d268b004c34adf40e56e4524f488279;hpb=07a560eab66b575f382428a956550817697e25e2;p=tinc

diff --git a/src/openssl/rsa.c b/src/openssl/rsa.c
index 17e8dbaf..986c98f2 100644
--- a/src/openssl/rsa.c
+++ b/src/openssl/rsa.c
@@ -12,11 +12,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "system.h"
@@ -31,16 +29,21 @@
 
 bool rsa_set_hex_public_key(rsa_t *rsa, char *n, char *e) {
 	*rsa = RSA_new();
-	BN_hex2bn(&(*rsa)->n, n);
-	BN_hex2bn(&(*rsa)->e, e);
+	if(BN_hex2bn(&(*rsa)->n, n) != strlen(n))
+		return false;
+	if(BN_hex2bn(&(*rsa)->e, e) != strlen(e))
+		return false;
 	return true;
 }
 
 bool rsa_set_hex_private_key(rsa_t *rsa, char *n, char *e, char *d) {
 	*rsa = RSA_new();
-	BN_hex2bn(&(*rsa)->n, n);
-	BN_hex2bn(&(*rsa)->e, e);
-	BN_hex2bn(&(*rsa)->d, d);
+	if(BN_hex2bn(&(*rsa)->n, n) != strlen(n))
+		return false;
+	if(BN_hex2bn(&(*rsa)->e, e) != strlen(e))
+		return false;
+	if(BN_hex2bn(&(*rsa)->d, d) != strlen(d))
+		return false;
 	return true;
 }
 
@@ -51,13 +54,13 @@ bool rsa_read_pem_public_key(rsa_t *rsa, FILE *fp) {
 
 	if(*rsa)
 		return true;
-	
+
 	*rsa = PEM_read_RSA_PUBKEY(fp, rsa, NULL, NULL);
 
 	if(*rsa)
 		return true;
 
-	logger(LOG_ERR, "Unable to read RSA public key: %s", ERR_error_string(ERR_get_error(), NULL));
+	logger(DEBUG_ALWAYS, LOG_ERR, "Unable to read RSA public key: %s", ERR_error_string(ERR_get_error(), NULL));
 	return false;
 }
 
@@ -66,8 +69,8 @@ bool rsa_read_pem_private_key(rsa_t *rsa, FILE *fp) {
 
 	if(*rsa)
 		return true;
-	
-	logger(LOG_ERR, "Unable to read RSA private key: %s", ERR_error_string(ERR_get_error(), NULL));
+
+	logger(DEBUG_ALWAYS, LOG_ERR, "Unable to read RSA private key: %s", ERR_error_string(ERR_get_error(), NULL));
 	return false;
 }
 
@@ -79,14 +82,25 @@ bool rsa_public_encrypt(rsa_t *rsa, void *in, size_t len, void *out) {
 	if(RSA_public_encrypt(len, in, out, *rsa, RSA_NO_PADDING) == len)
 		return true;
 
-	logger(LOG_ERR, "Unable to perform RSA encryption: %s", ERR_error_string(ERR_get_error(), NULL));
-	return false;	
+	logger(DEBUG_ALWAYS, LOG_ERR, "Unable to perform RSA encryption: %s", ERR_error_string(ERR_get_error(), NULL));
+	return false;
 }
 
 bool rsa_private_decrypt(rsa_t *rsa, void *in, size_t len, void *out) {
 	if(RSA_private_decrypt(len, in, out, *rsa, RSA_NO_PADDING) == len)
 		return true;
 
-	logger(LOG_ERR, "Unable to perform RSA decryption: %s", ERR_error_string(ERR_get_error(), NULL));
-	return false;	
+	logger(DEBUG_ALWAYS, LOG_ERR, "Unable to perform RSA decryption: %s", ERR_error_string(ERR_get_error(), NULL));
+	return false;
+}
+
+bool rsa_active(rsa_t *rsa) {
+	return *rsa;
+}
+
+void rsa_free(rsa_t *rsa) {
+	if(*rsa) {
+		RSA_free(*rsa);
+		*rsa = NULL;
+	}
 }