X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=client_common.c;h=ac53b9b547642ceb3e99c4ac47c91068405dec15;hb=40b1bbc50682effec5cf18b0923cfab24e154245;hp=b47364c9bd7b91c09d2e0c28fedc69efd3e5c6d0;hpb=6e0b28e02a1013c019a3225e922b71f913bfbae4;p=paraslash.git

diff --git a/client_common.c b/client_common.c
index b47364c9..ac53b9b5 100644
--- a/client_common.c
+++ b/client_common.c
@@ -241,11 +241,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;
@@ -292,18 +287,13 @@ static int client_post_select(struct sched *s, void *context)
 		if (ret < 0 || n == 0)
 			goto out;
 		ct->features = parse_features(buf);
-		if (!has_feature("sideband", ct)) {
-			PARA_ERROR_LOG("server has no sideband support\n");
-			ret = -E_INCOMPAT_FEAT;
-			goto out;
-		}
 		ct->status = CL_RECEIVED_WELCOME;
 		return 0;
 	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)
@@ -319,7 +309,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)
@@ -338,10 +327,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;
@@ -403,7 +391,7 @@ static int client_post_select(struct sched *s, void *context)
 					btr_consume(ct->btrn[1], sz);
 			}
 		}
-		/* fall though */
+		/* fall through */
 	case CL_EXECUTING:
 		if (ct->btrn[0]) {
 			ret = btr_node_status(ct->btrn[0], 0, BTR_NT_ROOT);