X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client_common.c;h=b1eaa78b2db7563b699c6993509e738b12f665a8;hp=deb3a26ded485f79855516fcd2c1c5f9772761b6;hb=a9126f461792a84c760162ecb25100f1593d427d;hpb=7137a51458b34fe031c005539ba5035edcd67695

diff --git a/client_common.c b/client_common.c
index deb3a26d..b1eaa78b 100644
--- a/client_common.c
+++ b/client_common.c
@@ -8,6 +8,7 @@
 
 #include <sys/types.h>
 #include <dirent.h>
+#include <openssl/rc4.h>
 
 #include "para.h"
 #include "error.h"
@@ -22,33 +23,6 @@
 #include "client.cmdline.h"
 #include "client.h"
 
-/*
- * Rc4-encrypt data before sending.
- *
- * \param len The number of bytes to encrypt.
- * \param indata Pointer to the input data of length \a len to be encrypted.
- * \param outdata Result-pointer that holds the encrypted data.
- * \param private_data Contains the rc4 key.
- */
-static void rc4_send(unsigned long len, const unsigned char *indata,
-		unsigned char *outdata, void *private_data)
-{
-	struct client_task *ct = private_data;
-	RC4(&ct->rc4_send_key, len, indata, outdata);
-}
-
-/*
- * Rc4-decrypt received data.
- *
- * Parameters are identical to those of rc4_send.
- */
-static void rc4_recv(unsigned long len, const unsigned char *indata,
-		unsigned char *outdata, void *private_data)
-{
-	struct client_task *ct = private_data;
-	RC4(&ct->rc4_recv_key, len, indata, outdata);
-}
-
 /**
  * Close the connection to para_server and free all resources.
  *
@@ -60,10 +34,8 @@ void client_close(struct client_task *ct)
 {
 	if (!ct)
 		return;
-	if (ct->fd >= 0) {
-		disable_crypt(ct->fd);
-		close(ct->fd);
-	}
+	if (ct->rc4c.fd >= 0)
+		close(ct->rc4c.fd);
 	free(ct->buf);
 	free(ct->user);
 	free(ct->config_file);
@@ -92,27 +64,27 @@ static void client_pre_select(struct sched *s, struct task *t)
 
 	ct->check_r = 0;
 	ct->check_w = 0;
-	if (ct->fd < 0)
+	if (ct->rc4c.fd < 0)
 		return;
 	switch (ct->status) {
 	case CL_CONNECTED:
 	case CL_SENT_AUTH:
 	case CL_SENT_CH_RESPONSE:
 	case CL_SENT_COMMAND:
-		para_fd_set(ct->fd, &s->rfds, &s->max_fileno);
+		para_fd_set(ct->rc4c.fd, &s->rfds, &s->max_fileno);
 		ct->check_r = 1;
 		return;
 
 	case CL_RECEIVED_WELCOME:
 	case CL_RECEIVED_CHALLENGE:
 	case CL_RECEIVED_PROCEED:
-		para_fd_set(ct->fd, &s->wfds, &s->max_fileno);
+		para_fd_set(ct->rc4c.fd, &s->wfds, &s->max_fileno);
 		ct->check_w = 1;
 		return;
 
 	case CL_RECEIVING:
 		if (ct->loaded < CLIENT_BUFSIZE - 1) {
-			para_fd_set(ct->fd, &s->rfds, &s->max_fileno);
+			para_fd_set(ct->rc4c.fd, &s->rfds, &s->max_fileno);
 			ct->check_r = 1;
 		}
 		return;
@@ -121,7 +93,7 @@ static void client_pre_select(struct sched *s, struct task *t)
 			return;
 		if (*ct->in_loaded) {
 			PARA_INFO_LOG("loaded: %zd\n", *ct->in_loaded);
-			para_fd_set(ct->fd, &s->wfds, &s->max_fileno);
+			para_fd_set(ct->rc4c.fd, &s->wfds, &s->max_fileno);
 			ct->check_w = 1;
 		} else {
 			if (*ct->in_error) {
@@ -136,8 +108,14 @@ static void client_pre_select(struct sched *s, struct task *t)
 
 static ssize_t client_recv_buffer(struct client_task *ct)
 {
-	ssize_t ret = recv_buffer(ct->fd, ct->buf + ct->loaded,
-		CLIENT_BUFSIZE - ct->loaded);
+	ssize_t ret;
+
+	if (ct->status < CL_RECEIVED_PROCEED)
+		ret = recv_buffer(ct->rc4c.fd, ct->buf + ct->loaded,
+			CLIENT_BUFSIZE - ct->loaded);
+	else
+		ret = rc4_recv_buffer(&ct->rc4c, ct->buf + ct->loaded,
+			CLIENT_BUFSIZE - ct->loaded);
 	if (!ret)
 		return -E_SERVER_EOF;
 	if (ret > 0)
@@ -164,13 +142,13 @@ static void client_post_select(struct sched *s, struct task *t)
 	struct client_task *ct = container_of(t, struct client_task, task);
 
 	t->error = 0;
-	if (ct->fd < 0)
+	if (ct->rc4c.fd < 0)
 		return;
 	if (!ct->check_r && !ct->check_w)
 		return;
-	if (ct->check_r && !FD_ISSET(ct->fd, &s->rfds))
+	if (ct->check_r && !FD_ISSET(ct->rc4c.fd, &s->rfds))
 		return;
-	if (ct->check_w && !FD_ISSET(ct->fd, &s->wfds))
+	if (ct->check_w && !FD_ISSET(ct->rc4c.fd, &s->wfds))
 		return;
 	switch (ct->status) {
 	case CL_CONNECTED: /* receive welcome message */
@@ -181,7 +159,7 @@ static void client_post_select(struct sched *s, struct task *t)
 	case CL_RECEIVED_WELCOME: /* send auth command */
 		sprintf(ct->buf, "auth rc4 %s", ct->user);
 		PARA_INFO_LOG("--> %s\n", ct->buf);
-		t->error = send_buffer(ct->fd, ct->buf);
+		t->error = send_buffer(ct->rc4c.fd, ct->buf);
 		if (t->error >= 0)
 			ct->status = CL_SENT_AUTH;
 		return;
@@ -204,7 +182,7 @@ static void client_post_select(struct sched *s, struct task *t)
 		return;
 	case CL_RECEIVED_CHALLENGE: /* send decrypted challenge */
 		PARA_INFO_LOG("--> %lu\n", ct->challenge_nr);
-		t->error = send_va_buffer(ct->fd, "%s%lu", CHALLENGE_RESPONSE_MSG,
+		t->error = send_va_buffer(ct->rc4c.fd, "%s%lu", CHALLENGE_RESPONSE_MSG,
 			ct->challenge_nr);
 		if (t->error > 0)
 			ct->status = CL_SENT_CH_RESPONSE;
@@ -232,9 +210,8 @@ static void client_post_select(struct sched *s, struct task *t)
 			bytes_received - PROCEED_MSG_LEN - 1);
 		if (t->error < 0)
 			return;
-		RC4_set_key(&ct->rc4_send_key, RC4_KEY_LEN, rc4_buf);
-		RC4_set_key(&ct->rc4_recv_key, RC4_KEY_LEN, rc4_buf + RC4_KEY_LEN);
-		enable_crypt(ct->fd, rc4_recv, rc4_send, ct);
+		RC4_set_key(&ct->rc4c.send_key, RC4_KEY_LEN, rc4_buf);
+		RC4_set_key(&ct->rc4c.recv_key, RC4_KEY_LEN, rc4_buf + RC4_KEY_LEN);
 		ct->status = CL_RECEIVED_PROCEED;
 		return;
 		}
@@ -250,7 +227,7 @@ static void client_post_select(struct sched *s, struct task *t)
 		}
 		command = para_strcat(command, EOC_MSG "\n");
 		PARA_DEBUG_LOG("--> %s\n", command);
-		t->error = send_buffer(ct->fd, command);
+		t->error = rc4_send_buffer(&ct->rc4c, command);
 		free(command);
 		if (t->error > 0)
 			ct->status = CL_SENT_COMMAND;
@@ -268,7 +245,7 @@ static void client_post_select(struct sched *s, struct task *t)
 		return;
 	case CL_SENDING: /* FIXME: might block */
 		PARA_INFO_LOG("loaded: %zd\n", *ct->in_loaded);
-		t->error = send_bin_buffer(ct->fd, ct->inbuf, *ct->in_loaded);
+		t->error = rc4_send_bin_buffer(&ct->rc4c, ct->inbuf, *ct->in_loaded);
 		if (t->error < 0)
 			return;
 		*ct->in_loaded = 0;
@@ -284,14 +261,14 @@ static int client_connect(struct client_task *ct)
 {
 	int ret;
 
-	ct->fd = -1;
+	ct->rc4c.fd = -1;
 	ret = makesock(AF_UNSPEC, IPPROTO_TCP, 0, ct->conf.hostname_arg,
 		ct->conf.server_port_arg);
 	if (ret < 0)
 		return ret;
-	ct->fd = ret;
+	ct->rc4c.fd = ret;
 	ct->status = CL_CONNECTED;
-	ret = mark_fd_nonblocking(ct->fd);
+	ret = mark_fd_nonblocking(ct->rc4c.fd);
 	if (ret < 0)
 		goto err_out;
 	ct->task.pre_select = client_pre_select;
@@ -300,8 +277,8 @@ static int client_connect(struct client_task *ct)
 	register_task(&ct->task);
 	return 1;
 err_out:
-	close(ct->fd);
-	ct->fd = -1;
+	close(ct->rc4c.fd);
+	ct->rc4c.fd = -1;
 	return ret;
 }
 
@@ -329,7 +306,7 @@ int client_open(int argc, char *argv[], struct client_task **ct_ptr,
 
 	ct->buf = para_malloc(CLIENT_BUFSIZE);
 	*ct_ptr = ct;
-	ct->fd = -1;
+	ct->rc4c.fd = -1;
 	ret = -E_CLIENT_SYNTAX;
 	if (client_cmdline_parser(argc, argv, &ct->conf))
 		goto out;