X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client_common.c;h=dc24a6280acc068bd2cb7cbc0fb178bd8586ca54;hp=094b93be85addc7882a1bfc8d65110ce128ec215;hb=c22c653634658511cd10c423840ca462ba8b12b3;hpb=8919784065fdfd210dc25e4ab31c6fa92f9e3219

diff --git a/client_common.c b/client_common.c
index 094b93be..dc24a628 100644
--- a/client_common.c
+++ b/client_common.c
@@ -86,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);
 		}
-		/* fallthrough */
+		__attribute__ ((fallthrough));
 	case CL_EXECUTING:
 		if (ct->btrn[0]) {
 			ret = btr_node_status(ct->btrn[0], 0, BTR_NT_ROOT);
@@ -318,15 +318,15 @@ static int client_post_select(struct sched *s, void *context)
 		}
 		n = sbb.iov.iov_len;
 		PARA_INFO_LOG("<-- [challenge] (%zu bytes)\n", n);
-		ret = priv_decrypt(ct->key_file, crypt_buf,
+		ret = apc_priv_decrypt(ct->key_file, crypt_buf,
 			sbb.iov.iov_base, n);
 		free(sbb.iov.iov_base);
 		if (ret < 0)
 			goto out;
 		ct->challenge_hash = para_malloc(HASH_SIZE);
-		hash_function((char *)crypt_buf, CHALLENGE_SIZE, ct->challenge_hash);
-		ct->scc.send = sc_new(crypt_buf + CHALLENGE_SIZE, SESSION_KEY_LEN);
-		ct->scc.recv = sc_new(crypt_buf + CHALLENGE_SIZE + SESSION_KEY_LEN,
+		hash_function((char *)crypt_buf, APC_CHALLENGE_SIZE, ct->challenge_hash);
+		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);
 		hash_to_asc(ct->challenge_hash, buf);
 		PARA_INFO_LOG("--> %s\n", buf);
@@ -389,7 +389,7 @@ static int client_post_select(struct sched *s, void *context)
 					btr_consume(ct->btrn[1], sz);
 			}
 		}
-		/* fall through */
+		__attribute__ ((fallthrough));
 	case CL_EXECUTING:
 		if (ct->btrn[0]) {
 			ret = btr_node_status(ct->btrn[0], 0, BTR_NT_ROOT);