X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=crypt.c;h=7161e626119b5052689b03f161117c53004f6729;hp=f064fb3a535d9df3306818d7e9c27ca85193bd50;hb=748d1368bc96dd7e1af879df1ea41b4d52842f7e;hpb=82d08fb6da4dfc7d93d1ee0cce4706721378fe12

diff --git a/crypt.c b/crypt.c
index f064fb3a..7161e626 100644
--- a/crypt.c
+++ b/crypt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -7,7 +7,6 @@
 /** \file crypt.c Openssl-based encryption/decryption routines. */
 
 #include <regex.h>
-#include <stdbool.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <openssl/rand.h>
@@ -184,27 +183,28 @@ int get_asymmetric_key(const char *key_file, int private,
 	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;
+		goto out_unmap;
 	blob_size = 2 * map_size;
 	blob = para_malloc(blob_size);
 	ret = uudecode(cp, blob, blob_size);
 	if (ret < 0)
-		goto out;
+		goto out_unmap;
 	decoded_size = ret;
 	ret = check_ssh_key_header(blob, decoded_size);
 	if (ret < 0)
-		goto out;
+		goto out_unmap;
 	ret = read_rsa_bignums(blob + ret, decoded_size - ret, &key->rsa);
 	if (ret < 0)
-		goto out;
+		goto out_unmap;
 	ret = RSA_size(key->rsa);
-out:
+out_unmap:
 	ret2 = para_munmap(map, map_size);
 	if (ret >= 0 && ret2 < 0)
 		ret = ret2;
+out:
 	if (ret < 0) {
 		free(key);
-		result = NULL;
+		*result = NULL;
 		PARA_ERROR_LOG("key %s: %s\n", key_file, para_strerror(-ret));
 	} else
 		*result = key;
@@ -298,7 +298,7 @@ int sc_send_bin_buffer(struct stream_cipher_context *scc, char *buf,
 		memcpy(remainder, buf + l1, len - l1);
 		RC4(&scc->send->key, len - l1, remainder, tmp + l1);
 	}
-	ret = write_all(scc->fd, (char *)tmp, &len);
+	ret = write_all(scc->fd, (char *)tmp, len);
 	free(tmp);
 	return ret;
 }
@@ -306,7 +306,7 @@ int sc_send_bin_buffer(struct stream_cipher_context *scc, char *buf,
 int sc_recv_bin_buffer(struct stream_cipher_context *scc, char *buf,
 		size_t size)
 {
-	unsigned char *tmp = para_malloc(size);
+	unsigned char *tmp = para_malloc(ROUND_UP(size, RC4_ALIGN));
 	ssize_t ret = recv(scc->fd, tmp, size, 0);
 
 	if (ret > 0)