X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=bfce809a310cbe7024386ed61a441f71d3cf4e82;hp=6db0c0039f7eed58c17ec9290103efc125e3ca63;hb=3998a8c581623224b7b56bce593646b2c8516a0f;hpb=f4019242252bf8e7594a72efdac6214a5abd4364

diff --git a/command.c b/command.c
index 6db0c003..bfce809a 100644
--- a/command.c
+++ b/command.c
@@ -874,12 +874,12 @@ static int run_command(struct command_context *cc, struct iovec *iov)
  * the function if the connection was not authenticated when the timeout
  * expires.
  *
- * \sa alarm(2), \ref crypt.c, \ref crypt.h.
+ * \sa alarm(2), \ref openssl.c, \ref crypt.h.
  */
 __noreturn void handle_connect(int fd)
 {
 	int ret;
-	unsigned char rand_buf[CHALLENGE_SIZE + 2 * SESSION_KEY_LEN];
+	unsigned char rand_buf[APC_CHALLENGE_SIZE + 2 * SESSION_KEY_LEN];
 	unsigned char challenge_hash[HASH_SIZE];
 	char *command = NULL, *buf = para_malloc(HANDSHAKE_BUFSIZE) /* must be on the heap */;
 	size_t numbytes;
@@ -909,7 +909,7 @@ __noreturn void handle_connect(int fd)
 		goto net_err;
 	if (cc->u) {
 		get_random_bytes_or_die(rand_buf, sizeof(rand_buf));
-		ret = pub_encrypt(cc->u->pubkey, rand_buf, sizeof(rand_buf),
+		ret = apc_pub_encrypt(cc->u->pubkey, rand_buf, sizeof(rand_buf),
 			(unsigned char *)buf);
 		if (ret < 0)
 			goto net_err;
@@ -924,7 +924,7 @@ __noreturn void handle_connect(int fd)
 		get_random_bytes_or_die((unsigned char *)buf, numbytes);
 	}
 	PARA_DEBUG_LOG("sending %d byte challenge + session key (%zu bytes)\n",
-		CHALLENGE_SIZE, numbytes);
+		APC_CHALLENGE_SIZE, numbytes);
 	ret = send_sb(&cc->scc, buf, numbytes, SBD_CHALLENGE, false);
 	buf = NULL;
 	if (ret < 0)
@@ -940,21 +940,21 @@ __noreturn void handle_connect(int fd)
 	if (!cc->u)
 		goto net_err;
 	/*
-	 * The correct response is the hash of the first CHALLENGE_SIZE bytes
+	 * The correct response is the hash of the first APC_CHALLENGE_SIZE bytes
 	 * of the random data.
 	 */
 	ret = -E_BAD_AUTH;
 	if (numbytes != HASH_SIZE)
 		goto net_err;
-	hash_function((char *)rand_buf, CHALLENGE_SIZE, challenge_hash);
+	hash_function((char *)rand_buf, APC_CHALLENGE_SIZE, challenge_hash);
 	if (memcmp(challenge_hash, buf, HASH_SIZE))
 		goto net_err;
 	/* auth successful */
 	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);
-	cc->scc.send = sc_new(rand_buf + CHALLENGE_SIZE + SESSION_KEY_LEN,
+	cc->scc.recv = sc_new(rand_buf + APC_CHALLENGE_SIZE, SESSION_KEY_LEN);
+	cc->scc.send = sc_new(rand_buf + APC_CHALLENGE_SIZE + SESSION_KEY_LEN,
 		SESSION_KEY_LEN);
 	ret = send_sb(&cc->scc, NULL, 0, SBD_PROCEED, false);
 	if (ret < 0)