X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=command.c;h=15b166adbb1c959c803c46bc38a270e95e1e8e7d;hb=7137a51458b34fe031c005539ba5035edcd67695;hp=229ec5c6fcbdfcc6c015ef41e082db2ff3a90f23;hpb=a7f31bd369e5eda15361bef5aee2529bdb6eb89e;p=paraslash.git

diff --git a/command.c b/command.c
index 229ec5c6..15b166ad 100644
--- a/command.c
+++ b/command.c
@@ -687,7 +687,7 @@ static void reset_signals(void)
  */
 __noreturn void handle_connect(int fd, const char *peername)
 {
-	int ret, argc, use_rc4 = 0;
+	int ret, argc;
 	char buf[4096];
 	unsigned char crypt_buf[MAXLINE];
 	struct user *u;
@@ -712,23 +712,16 @@ __noreturn void handle_connect(int fd, const char *peername)
 	ret = recv_buffer(fd, buf, sizeof(buf));
 	if (ret < 0)
 		goto err_out;
-	if (ret <= 6) {
+	if (ret < 10) {
 		ret = -E_AUTH;
 		goto err_out;
 	}
 	numbytes = ret;
 	ret = -E_AUTH;
-	if (strncmp(buf, "auth ", 5))
+	if (strncmp(buf, "auth rc4 ", 9))
 		goto err_out;
-
-	if (numbytes < 9 || strncmp(buf, "auth rc4 ", 9))
-		p = buf + 5; /* client version < 0.2.6 */
-	else {
-		p = buf + 9; /* client version >= 0.2.6 */
-		use_rc4 = 1;
-	}
-	PARA_DEBUG_LOG("received %s request for user %s\n",
-		use_rc4? "rc4" : "auth", p);
+	p = buf + 9;
+	PARA_DEBUG_LOG("received auth request for user %s\n", p);
 	ret = -E_BAD_USER;
 	u = lookup_user(p);
 	if (!u)
@@ -756,20 +749,17 @@ __noreturn void handle_connect(int fd, const char *peername)
 	/* auth successful, send 'Proceed' message */
 	PARA_INFO_LOG("good auth for %s (%lu)\n", u->name, challenge_nr);
 	sprintf(buf, "%s", PROCEED_MSG);
-	if (use_rc4) {
-		init_rc4_keys();
-		ret = para_encrypt_buffer(u->rsa, rc4_buf, 2 * RC4_KEY_LEN,
-			(unsigned char *)buf + PROCEED_MSG_LEN + 1);
-		if (ret <= 0)
-			goto err_out;
-		numbytes = ret + strlen(PROCEED_MSG) + 1;
-	} else
-		numbytes = strlen(buf);
+	init_rc4_keys();
+	/* Should we also encrypt the proceed message? */
+	ret = para_encrypt_buffer(u->rsa, rc4_buf, 2 * RC4_KEY_LEN,
+		(unsigned char *)buf + PROCEED_MSG_LEN + 1);
+	if (ret <= 0)
+		goto err_out;
+	numbytes = ret + strlen(PROCEED_MSG) + 1;
 	ret = send_bin_buffer(fd, buf, numbytes);
 	if (ret < 0)
 		goto net_err;
-	if (use_rc4)
-		enable_crypt(fd, rc4_recv, rc4_send, NULL);
+	enable_crypt(fd, rc4_recv, rc4_send, NULL);
 	ret = read_command(fd, &command);
 	if (ret == -E_COMMAND_SYNTAX)
 		goto err_out;
@@ -791,8 +781,6 @@ __noreturn void handle_connect(int fd, const char *peername)
 	ret = cmd->handler(fd, argc, argv);
 	mutex_lock(mmd_mutex);
 	mmd->num_commands++;
-	free(mmd->afd.afhi.info_string);
-	free(mmd->afd.afhi.chunk_table);
 	mutex_unlock(mmd_mutex);
 	if (ret >= 0)
 		goto out;