X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=net.c;h=221ad89074226753f58832052a0ccf08103724e8;hb=ab6cab06766f86086b53f2720d566f7ddf70db4c;hp=c5f33c822164195615d7f8f318f22a3f1d43a79f;hpb=8211954fc3390c0fa19cca788b03336a37aa9dc0;p=paraslash.git

diff --git a/net.c b/net.c
index c5f33c82..221ad890 100644
--- a/net.c
+++ b/net.c
@@ -6,10 +6,10 @@
 
 /** \file net.c networking-related helper functions */
 
+#include "error.h"
 #include "para.h"
 #include "net.h"
 #include "string.h"
-#include "error.h"
 
 
 /** Information about one encrypted connection. */
@@ -151,7 +151,8 @@ int send_bin_buffer(int fd, const char *buf, size_t len)
 		cf = crypt_data_array[fd].send;
 	if (cf) {
 		void *private = crypt_data_array[fd].private_data;
-		unsigned char *outbuf = para_malloc(len);
+		/* RC4 may write more than len to the output buffer */
+		unsigned char *outbuf = para_malloc(ROUND_UP(len, 8));
 		(*cf)(len, (unsigned char *)buf, outbuf, private);
 		ret = sendall(fd, (char *)outbuf, &len);
 		free(outbuf);
@@ -301,26 +302,6 @@ int get_stream_socket(int domain)
 	return socket_fd;
 }
 
-/**
- * a wrapper around connect(2)
- *
- * \param fd the file descriptor
- * \param their_addr the address to connect
- *
- * \return \p -E_CONNECT on errors, 1 on success
- *
- * \sa connect(2)
- */
-int para_connect(int fd, struct sockaddr_in *their_addr)
-{
-	int ret;
-
-	if ((ret = connect(fd, (struct sockaddr *)their_addr,
-			sizeof(struct sockaddr))) == -1)
-		return -E_CONNECT;
-	return 1;
-}
-
 /**
  * paraslash's wrapper around the accept system call
  *