X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=client_common.c;h=fe8234f98fe90f6ce74ea5e22699fbfc0059a042;hb=b3ca15a62c2973cf6acd72198c418628a49caf03;hp=642852ec6b8751454538ac9f3a021970f5cfbdef;hpb=a25f6bb7169f0ea86522a0c613a8ec1dad358103;p=paraslash.git

diff --git a/client_common.c b/client_common.c
index 642852ec..fe8234f9 100644
--- a/client_common.c
+++ b/client_common.c
@@ -262,7 +262,7 @@ static bool has_feature(const char *feature, struct client_task *ct)
 		return false;
 	for (int i = 0; ct->features[i]; i++)
 		if (strcmp(feature, ct->features[i]) == 0)
-			return i;
+			return true;
 	return false;
 }
 
@@ -344,15 +344,18 @@ static int client_post_monitor(struct sched *s, void *context)
 			goto out;
 		ct->challenge_hash = alloc(HASH2_SIZE);
 		if (has_feature("sha256", ct)) {
-			hash2_function((char *)crypt_buf, APC_CHALLENGE_SIZE, ct->challenge_hash);
+			hash2_function((char *)crypt_buf, APC_CHALLENGE_SIZE,
+				ct->challenge_hash);
 			hash2_to_asc(ct->challenge_hash, buf);
 		} else {
-			hash_function((char *)crypt_buf, APC_CHALLENGE_SIZE, ct->challenge_hash);
+			hash_function((char *)crypt_buf, APC_CHALLENGE_SIZE,
+				ct->challenge_hash);
 			hash_to_asc(ct->challenge_hash, buf);
 		}
-		ct->scc.send = sc_new(crypt_buf + APC_CHALLENGE_SIZE, SESSION_KEY_LEN);
-		ct->scc.recv = sc_new(crypt_buf + APC_CHALLENGE_SIZE + SESSION_KEY_LEN,
-			SESSION_KEY_LEN);
+		ct->scc.send = sc_new(crypt_buf + APC_CHALLENGE_SIZE,
+			 SESSION_KEY_LEN);
+		ct->scc.recv = sc_new(crypt_buf + APC_CHALLENGE_SIZE
+			+ SESSION_KEY_LEN, SESSION_KEY_LEN);
 		PARA_INFO_LOG("--> %s\n", buf);
 		ct->status = CL_RECEIVED_CHALLENGE;
 		return 0;