X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=crypt.c;fp=crypt.c;h=f227eb39907691d24f0eae360c04027c1653be75;hb=35fcd604e2ec04f8667c85fa1552932b1a0e6efb;hp=222bece7249add6aa01639419d63a42426ca9c84;hpb=3ea5399aeec092dcdb9f039288f1e146aadbb2f7;p=paraslash.git

diff --git a/crypt.c b/crypt.c
index 222bece7..f227eb39 100644
--- a/crypt.c
+++ b/crypt.c
@@ -159,7 +159,7 @@ int get_asymmetric_key(const char *key_file, int private,
 	struct asymmetric_key *key = NULL;
 	void *map = NULL;
 	unsigned char *blob = NULL;
-	size_t map_size, blob_size, decoded_size;
+	size_t map_size, encoded_size, decoded_size;
 	int ret, ret2;
 	char *cp;
 
@@ -181,16 +181,11 @@ int get_asymmetric_key(const char *key_file, int private,
 		goto out;
 	}
 	cp = map + ret;
+	encoded_size = map_size - ret;
 	PARA_INFO_LOG("decoding public rsa-ssh key %s\n", key_file);
-	ret = -ERRNO_TO_PARA_ERROR(EOVERFLOW);
-	if (map_size > INT_MAX / 4)
-		goto out_unmap;
-	blob_size = 2 * map_size;
-	blob = para_malloc(blob_size);
-	ret = uudecode(cp, blob, blob_size);
+	ret = uudecode(cp, encoded_size, (char **)&blob, &decoded_size);
 	if (ret < 0)
 		goto out_unmap;
-	decoded_size = ret;
 	ret = check_ssh_key_header(blob, decoded_size);
 	if (ret < 0)
 		goto out_unmap;