X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=crypt.c;h=c15768a3d954c6e0489b0527bd9415432c4517aa;hb=f553ab861efaa14f3a07ffb074c9e640b9fc776a;hp=085c0563d0afb2eb23669d4084e4f83c92ff5540;hpb=b4c9282be012ea84f7154684e9b2a469171e5e2b;p=paraslash.git

diff --git a/crypt.c b/crypt.c
index 085c0563..c15768a3 100644
--- a/crypt.c
+++ b/crypt.c
@@ -155,8 +155,7 @@ fail:
 	return ret;
 }
 
-int get_asymmetric_key(const char *key_file, int private,
-		struct asymmetric_key **result)
+int get_public_key(const char *key_file, struct asymmetric_key **result)
 {
 	struct asymmetric_key *key = NULL;
 	void *map = NULL;
@@ -166,10 +165,6 @@ int get_asymmetric_key(const char *key_file, int private,
 	char *cp;
 
 	key = para_malloc(sizeof(*key));
-	if (private) {
-		ret = get_openssl_key(key_file, &key->rsa, LOAD_PRIVATE_KEY);
-		goto out;
-	}
 	ret = mmap_full_file(key_file, O_RDONLY, &map, &map_size, NULL);
 	if (ret < 0)
 		goto out;
@@ -210,7 +205,7 @@ out:
 	return ret;
 }
 
-void free_asymmetric_key(struct asymmetric_key *key)
+void free_public_key(struct asymmetric_key *key)
 {
 	if (!key)
 		return;
@@ -229,9 +224,12 @@ int priv_decrypt(const char *key_file, unsigned char *outbuf,
 		return ret;
 	if (inlen < 0)
 		return -E_RSA;
-	ret = get_asymmetric_key(key_file, LOAD_PRIVATE_KEY, &priv);
-	if (ret < 0)
+	priv = para_malloc(sizeof(*priv));
+	ret = get_openssl_key(key_file, &priv->rsa, LOAD_PRIVATE_KEY);
+	if (ret < 0) {
+		free(priv);
 		return ret;
+	}
 	/*
 	 * RSA is vulnerable to timing attacks. Generate a random blinding
 	 * factor to protect against this kind of attack.
@@ -245,7 +243,8 @@ int priv_decrypt(const char *key_file, unsigned char *outbuf,
 	if (ret <= 0)
 		ret = -E_DECRYPT;
 out:
-	free_asymmetric_key(priv);
+	RSA_free(priv->rsa);
+	free(priv);
 	return ret;
 }