X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=crypt.c;h=5445138d53f6589ebce6645b027531f02b74c860;hp=7b7c16d348952dab0dccbbd2170af178a703adb3;hb=b3644a3f5de245609dc608a947ed71e2f75b2fd5;hpb=c5670af5c1f784fe6c3d46d0281f2ba7c47af75e

diff --git a/crypt.c b/crypt.c
index 7b7c16d3..5445138d 100644
--- a/crypt.c
+++ b/crypt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2013 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>
@@ -148,8 +147,7 @@ static int read_rsa_bignums(const unsigned char *blob, int blen, RSA **result)
 	*result = rsa;
 	return 1;
 fail:
-	if (rsa)
-		RSA_free(rsa);
+	RSA_free(rsa);
 	return ret;
 }
 
@@ -184,24 +182,25 @@ 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;
@@ -283,38 +282,28 @@ void sc_free(struct stream_cipher *sc)
  */
 #define RC4_ALIGN 8
 
-int sc_send_bin_buffer(struct stream_cipher_context *scc, char *buf,
-		size_t len)
+void sc_crypt(struct stream_cipher *sc, struct iovec *src, struct iovec *dst)
 {
-	int ret;
-	unsigned char *tmp;
-	static unsigned char remainder[RC4_ALIGN];
-	size_t l1 = ROUND_DOWN(len, RC4_ALIGN), l2 = ROUND_UP(len, RC4_ALIGN);
-
-	assert(len);
-	tmp = para_malloc(l2);
-	RC4(&scc->send->key, l1, (const unsigned char *)buf, tmp);
+	size_t len = src->iov_len, l1, l2;
+	RC4_KEY *key = &sc->key;
+
+	assert(len > 0);
+	assert(len < ((typeof(src->iov_len))-1) / 2);
+	l1 = ROUND_DOWN(len, RC4_ALIGN);
+	l2 = ROUND_UP(len, RC4_ALIGN);
+
+	*dst = (typeof(*dst)) {
+		/* Add one for the terminating zero byte. */
+		.iov_base = para_malloc(l2 + 1),
+		.iov_len = len
+	};
+	RC4(key, l1, src->iov_base, dst->iov_base);
 	if (len > l1) {
-		memcpy(remainder, buf + l1, len - l1);
-		RC4(&scc->send->key, len - l1, remainder, tmp + l1);
+		unsigned char remainder[RC4_ALIGN] = "";
+		memcpy(remainder, src->iov_base + l1, len - l1);
+		RC4(key, len - l1, remainder, dst->iov_base + l1);
 	}
-	ret = write_all(scc->fd, (char *)tmp, &len);
-	free(tmp);
-	return ret;
-}
-
-int sc_recv_bin_buffer(struct stream_cipher_context *scc, char *buf,
-		size_t size)
-{
-	unsigned char *tmp = para_malloc(ROUND_UP(size, RC4_ALIGN));
-	ssize_t ret = recv(scc->fd, tmp, size, 0);
-
-	if (ret > 0)
-		RC4(&scc->recv->key, ret, tmp, (unsigned char *)buf);
-	else if (ret < 0)
-		ret = -ERRNO_TO_PARA_ERROR(errno);
-	free(tmp);
-	return ret;
+	((char *)dst->iov_base)[len] = '\0';
 }
 
 void hash_function(const char *data, unsigned long len, unsigned char *hash)