X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=58441b02495cef4465da6c675541b9feb64fce65;hp=0eb4efc22fa564fd2c055aa0753392696ad49a2f;hb=dbf829aac09a69f4b51a6a1f9fe15873b99fbdcf;hpb=9165680a9639a8412adef13b96e466efdbb9d806

diff --git a/command.c b/command.c
index 0eb4efc2..58441b02 100644
--- a/command.c
+++ b/command.c
@@ -473,7 +473,7 @@ static unsigned empty_status_items(int parser_friendly, char **result)
 			#define ITEM(x) "0004 %02x:\n"
 			EMPTY_STATUS_ITEMS
 			#undef ITEM
-			#define ITEM(x) , SI_ ## x
+			#define ITEM(x) , (unsigned) SI_ ## x
 			EMPTY_STATUS_ITEMS
 			#undef ITEM
 		);
@@ -767,7 +767,7 @@ static int com_jmp(struct command_context *cc)
 		i = 100;
 	PARA_INFO_LOG("jumping to %lu%%\n", i);
 	mmd->repos_request = (mmd->afd.afhi.chunks_total * i + 50) / 100;
-	PARA_INFO_LOG("sent: %lu, offset before jmp: %lu\n",
+	PARA_INFO_LOG("sent: %lu, offset before jmp: %li\n",
 		mmd->chunks_sent, mmd->offset);
 	mmd->new_vss_status_flags |= VSS_REPOS;
 	mmd->new_vss_status_flags &= ~VSS_NEXT;
@@ -807,7 +807,7 @@ static void reset_signals(void)
 }
 
 struct connection_features {
-	bool aes_ctr128_requested;
+	int dummy; /* none at the moment */
 };
 
 static int parse_auth_request(char *buf, int len, struct user **u,
@@ -836,7 +836,7 @@ static int parse_auth_request(char *buf, int len, struct user **u,
 			if (strcmp(features[i], "sideband") == 0)
 				continue;
 			if (strcmp(features[i], "aes_ctr128") == 0)
-				cf->aes_ctr128_requested = true;
+				continue;
 			else {
 				ret = -E_BAD_FEATURE;
 				goto out;
@@ -964,7 +964,7 @@ __noreturn void handle_connect(int fd, const char *peername)
 		numbytes = 256;
 		get_random_bytes_or_die((unsigned char *)buf, numbytes);
 	}
-	PARA_DEBUG_LOG("sending %u byte challenge + session key (%zu bytes)\n",
+	PARA_DEBUG_LOG("sending %d byte challenge + session key (%zu bytes)\n",
 		CHALLENGE_SIZE, numbytes);
 	ret = send_sb(&cc->scc, buf, numbytes, SBD_CHALLENGE, false);
 	buf = NULL;
@@ -994,10 +994,9 @@ __noreturn void handle_connect(int fd, const char *peername)
 	alarm(0);
 	PARA_INFO_LOG("good auth for %s\n", cc->u->name);
 	/* init stream cipher keys with the second part of the random buffer */
-	cc->scc.recv = sc_new(rand_buf + CHALLENGE_SIZE, SESSION_KEY_LEN,
-		cf.aes_ctr128_requested);
+	cc->scc.recv = sc_new(rand_buf + CHALLENGE_SIZE, SESSION_KEY_LEN);
 	cc->scc.send = sc_new(rand_buf + CHALLENGE_SIZE + SESSION_KEY_LEN,
-		SESSION_KEY_LEN, cf.aes_ctr128_requested);
+		SESSION_KEY_LEN);
 	ret = send_sb(&cc->scc, NULL, 0, SBD_PROCEED, false);
 	if (ret < 0)
 		goto net_err;