X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=8c61732592269301e22bd4ecfffc0c5cf5571ceb;hp=9bf6c3f88004fb3c4a00a2d892b58a53e7a3df89;hb=a9126f461792a84c760162ecb25100f1593d427d;hpb=345e7b4adce741621a412c3845712e8540b572ad

diff --git a/server.c b/server.c
index 9bf6c3f8..8c617325 100644
--- a/server.c
+++ b/server.c
@@ -59,15 +59,17 @@
  *	- Ring buffer: \ref ringbuffer.c, \ref ringbuffer.h,
  *	- Hashing: \ref hash.h, \ref sha1.h, \ref sha1.c,
  *	- Crypto: \ref crypt.c.
- *
+ *	- Forward error correction: \ref fec.c
  */
 
 #include <signal.h>
 #include <dirent.h>
 #include <sys/time.h>
+#include <openssl/rc4.h>
 
 #include "para.h"
 #include "error.h"
+#include "crypt.h"
 #include "server.cmdline.h"
 #include "afh.h"
 #include "string.h"
@@ -372,7 +374,6 @@ static void command_post_select(struct sched *s, struct task *t)
 	PARA_INFO_LOG("got connection from %s, forking\n", peer_name);
 	mmd->num_connects++;
 	mmd->active_connections++;
-	random();
 	/* The chunk table and the info_string are pointers located in the
 	 * mmd struct that point to dynamically allocated memory that must be
 	 * freed by the parent and the child. However, as the mmd struct is in
@@ -438,35 +439,6 @@ err:
 	exit(EXIT_FAILURE);
 }
 
-static void init_random_seed(void)
-{
-	unsigned int seed;
-	int fd, ret = para_open("/dev/urandom", O_RDONLY, 0);
-
-	if (ret < 0)
-		goto err;
-	fd = ret;
-	ret = read(fd, &seed, sizeof(seed));
-	if (ret < 0) {
-		ret = -ERRNO_TO_PARA_ERROR(errno);
-		goto out;
-	}
-	if (ret != sizeof(seed)) {
-		ret = -ERRNO_TO_PARA_ERROR(EIO);
-		goto out;
-	}
-	srandom(seed);
-	ret = 1;
-out:
-	close(fd);
-	if (ret >= 0)
-		return;
-err:
-	PARA_EMERG_LOG("can not seed pseudo random number generator: %s\n",
-		para_strerror(-ret));
-	exit(EXIT_FAILURE);
-}
-
 static int init_afs(void)
 {
 	int ret, afs_server_socket[2];
@@ -474,7 +446,8 @@ static int init_afs(void)
 	ret = socketpair(PF_UNIX, SOCK_DGRAM, 0, afs_server_socket);
 	if (ret < 0)
 		exit(EXIT_FAILURE);
-	afs_socket_cookie = para_random((uint32_t)-1);
+	get_random_bytes_or_die((unsigned char *)&afs_socket_cookie,
+		sizeof(afs_socket_cookie));
 	mmd->afs_pid = fork();
 	if (mmd->afs_pid < 0)
 		exit(EXIT_FAILURE);
@@ -510,7 +483,7 @@ static void server_init(int argc, char **argv)
 	int afs_socket;
 
 	valid_fd_012();
-	init_random_seed();
+	init_random_seed_or_die();
 	/* parse command line options */
 	server_cmdline_parser_ext(argc, argv, &conf, &params);
 	HANDLE_VERSION_FLAG("server", conf);