X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client_common.c;h=d3a9ede1f0e1d5b7238a387f0f3aa03650deed55;hp=8e1ca2841b13267c80c9f6328ba4c436ea94701b;hb=a24d175e6d093d6d9f6e583c3026e45924bad621;hpb=15714678f57f0e8931a70d64dca43c31e693bb61

diff --git a/client_common.c b/client_common.c
index 8e1ca284..d3a9ede1 100644
--- a/client_common.c
+++ b/client_common.c
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
 
 #include "para.h"
 #include "error.h"
@@ -16,14 +15,13 @@
 #include "sched.h"
 #include "client.cmdline.h"
 #include "crypt.h"
-#include "rc4.h"
 #include "net.h"
 #include "fd.h"
 #include "string.h"
 #include "client.cmdline.h"
 #include "client.h"
-#include "hash.h"
 #include "buffer_tree.h"
+#include "version.h"
 
 /** The size of the receiving buffer. */
 #define CLIENT_BUFSIZE 4000
@@ -183,7 +181,7 @@ static void client_post_select(struct sched *s, struct task *t)
 		/* decrypted challenge/session key buffer */
 		unsigned char crypt_buf[1024];
 		/* the SHA1 of the decrypted challenge */
-		unsigned char challenge_sha1[HASH_SIZE];
+		unsigned char challenge_hash[HASH_SIZE];
 
 		ret = client_recv_buffer(ct, &s->rfds, buf, sizeof(buf), &n);
 		if (ret < 0 || n == 0)
@@ -193,13 +191,13 @@ static void client_post_select(struct sched *s, struct task *t)
 			(unsigned char *)buf, n);
 		if (ret < 0)
 			goto out;
-		sha1_hash((char *)crypt_buf, CHALLENGE_SIZE, challenge_sha1);
+		hash_function((char *)crypt_buf, CHALLENGE_SIZE, 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,
 			SESSION_KEY_LEN);
-		hash_to_asc(challenge_sha1, buf);
+		hash_to_asc(challenge_hash, buf);
 		PARA_INFO_LOG("--> %s\n", buf);
-		ret = send_bin_buffer(ct->scc.fd, (char *)challenge_sha1,
+		ret = send_bin_buffer(ct->scc.fd, (char *)challenge_hash,
 			HASH_SIZE);
 		if (ret < 0)
 			goto out;