X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client_common.c;h=a06aaa000b1df567914a00c65ec7cd86b00e6e46;hp=c22312c883d06d261eee97bcf9c8432d4f284e7c;hb=764e71ceb1e188086c08e38dfd52d45b67dc15ba;hpb=1789666b13d830b97f7b95fa5296ecc4fb199b22

diff --git a/client_common.c b/client_common.c
index c22312c8..a06aaa00 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;
@@ -299,8 +294,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 +311,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 +329,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;