X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client_common.c;h=97d29f8fd09948b1e97972431df1f62ec30a4989;hp=c22312c883d06d261eee97bcf9c8432d4f284e7c;hb=a35c113e0bb9fa9ac02b77eb01dd32f49cd5c8d0;hpb=56330d8f7795979211591bb54273c59beeb45327

diff --git a/client_common.c b/client_common.c
index c22312c8..97d29f8f 100644
--- a/client_common.c
+++ b/client_common.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 1997 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 1997 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file client_common.c Common functions of para_client and para_audiod. */
 
@@ -90,7 +86,7 @@ static void client_pre_select(struct sched *s, void *context)
 			else if (ret > 0)
 				para_fd_set(ct->scc.fd, &s->wfds, &s->max_fileno);
 		}
-		/* fall though */
+		/* fallthrough */
 	case CL_EXECUTING:
 		if (ct->btrn[0]) {
 			ret = btr_node_status(ct->btrn[0], 0, BTR_NT_ROOT);
@@ -241,11 +237,6 @@ out:
 	return ret;
 }
 
-static bool has_feature(const char *feature, struct client_task *ct)
-{
-	return find_arg(feature, ct->features) >= 0? true : false;
-}
-
 static int send_sb_command(struct client_task *ct)
 {
 	int i;
@@ -299,8 +290,8 @@ static int client_post_select(struct sched *s, void *context)
 	case CL_RECEIVED_WELCOME: /* send auth command */
 		if (!FD_ISSET(ct->scc.fd, &s->wfds))
 			return 0;
-		sprintf(buf, AUTH_REQUEST_MSG "%s sideband%s", ct->user,
-			has_feature("aes_ctr128", ct)? ",aes_ctr128" : "");
+		sprintf(buf, AUTH_REQUEST_MSG "%s sideband,aes_ctr128",
+			ct->user);
 		PARA_INFO_LOG("--> %s\n", buf);
 		ret = write_buffer(ct->scc.fd, buf);
 		if (ret < 0)
@@ -316,7 +307,6 @@ static int client_post_select(struct sched *s, void *context)
 		/* decrypted challenge/session key buffer */
 		unsigned char crypt_buf[1024];
 		struct sb_buffer sbb;
-		bool use_aes;
 
 		ret = recv_sb(ct, &s->rfds, &sbb);
 		if (ret <= 0)
@@ -335,10 +325,9 @@ static int client_post_select(struct sched *s, void *context)
 			goto out;
 		ct->challenge_hash = para_malloc(HASH_SIZE);
 		hash_function((char *)crypt_buf, CHALLENGE_SIZE, ct->challenge_hash);
-		use_aes = has_feature("aes_ctr128", ct);
-		ct->scc.send = sc_new(crypt_buf + CHALLENGE_SIZE, SESSION_KEY_LEN, use_aes);
+		ct->scc.send = sc_new(crypt_buf + CHALLENGE_SIZE, SESSION_KEY_LEN);
 		ct->scc.recv = sc_new(crypt_buf + CHALLENGE_SIZE + SESSION_KEY_LEN,
-			SESSION_KEY_LEN, use_aes);
+			SESSION_KEY_LEN);
 		hash_to_asc(ct->challenge_hash, buf);
 		PARA_INFO_LOG("--> %s\n", buf);
 		ct->status = CL_RECEIVED_CHALLENGE;