X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=command.c;h=d82bd5d71ca3ed6bf2fa40777c5a5b1231fd897f;hb=3923f936294f9f900dc8c6a1c0fe84f0e2852dca;hp=6bb8cbed7117777fc98513a4a70b1c88e016bd28;hpb=15714678f57f0e8931a70d64dca43c31e693bb61;p=paraslash.git

diff --git a/command.c b/command.c
index 6bb8cbed..d82bd5d7 100644
--- a/command.c
+++ b/command.c
@@ -10,7 +10,6 @@
 #include <signal.h>
 #include <sys/time.h>
 #include <sys/types.h>
-#include <dirent.h>
 #include <osl.h>
 #include <stdbool.h>
 
@@ -26,7 +25,6 @@
 #include "list.h"
 #include "send.h"
 #include "vss.h"
-#include "rc4.h"
 #include "net.h"
 #include "daemon.h"
 #include "fd.h"
@@ -36,6 +34,7 @@
 #include "afs_command_list.h"
 #include "sched.h"
 #include "signal.h"
+#include "version.h"
 
 /** Commands including options must be shorter than this. */
 #define MAX_COMMAND_LEN 32768
@@ -731,7 +730,7 @@ __noreturn void handle_connect(int fd, const char *peername)
 	int ret, argc;
 	char buf[4096];
 	unsigned char rand_buf[CHALLENGE_SIZE + 2 * SESSION_KEY_LEN];
-	unsigned char challenge_sha1[HASH_SIZE];
+	unsigned char challenge_hash[HASH_SIZE];
 	struct user *u;
 	struct server_command *cmd = NULL;
 	char **argv = NULL;
@@ -796,14 +795,14 @@ __noreturn void handle_connect(int fd, const char *peername)
 	if (!u)
 		goto net_err;
 	/*
-	 * The correct response is the sha1 of the first CHALLENGE_SIZE bytes
+	 * The correct response is the hash of the first CHALLENGE_SIZE bytes
 	 * of the random data.
 	 */
 	ret = -E_BAD_AUTH;
 	if (numbytes != HASH_SIZE)
 		goto net_err;
-	sha1_hash((char *)rand_buf, CHALLENGE_SIZE, challenge_sha1);
-	if (memcmp(challenge_sha1, buf, HASH_SIZE))
+	hash_function((char *)rand_buf, CHALLENGE_SIZE, challenge_hash);
+	if (memcmp(challenge_hash, buf, HASH_SIZE))
 		goto net_err;
 	/* auth successful */
 	alarm(0);