Make rc4 encryption/decryption more explicit.

[paraslash.git] / server.c

diff --git a/server.c b/server.c
index da55b99923621975335a86a7dfbbad41e3e6a573..8c61732592269301e22bd4ecfffc0c5cf5571ceb 100644 (file)
--- 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.
  *     - 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 <signal.h>
 #include <dirent.h>
 #include <sys/time.h>

+#include <openssl/rc4.h>

 
 #include "para.h"
 #include "error.h"
 
 #include "para.h"
 #include "error.h"

+#include "crypt.h"

 #include "server.cmdline.h"
 #include "afh.h"
 #include "string.h"
 #include "server.cmdline.h"
 #include "afh.h"
 #include "string.h"


@@ -335,25 +337,15 @@ static void init_signal_task(void)
        st->task.post_select = signal_post_select;
        sprintf(st->task.status, "signal task");
 
        st->task.post_select = signal_post_select;
        sprintf(st->task.status, "signal task");
 

+       PARA_NOTICE_LOG("setting up signal handling\n");

        st->fd = para_signal_init(); /* always successful */
        st->fd = para_signal_init(); /* always successful */

-
-       PARA_NOTICE_LOG("setting up signal handlers\n");
-       if (para_install_sighandler(SIGINT) < 0)
-               goto err;
-       if (para_install_sighandler(SIGTERM) < 0)
-               goto err;
-       if (para_install_sighandler(SIGHUP) < 0)
-               goto err;
-       if (para_install_sighandler(SIGCHLD) < 0)
-               goto err;
-       if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
-               goto err;
+       para_install_sighandler(SIGINT);
+       para_install_sighandler(SIGTERM);
+       para_install_sighandler(SIGHUP);
+       para_install_sighandler(SIGCHLD);
+       para_sigaction(SIGPIPE, SIG_IGN);

        add_close_on_fork_list(st->fd);
        register_task(&st->task);
        add_close_on_fork_list(st->fd);
        register_task(&st->task);

-       return;
-err:
-       PARA_EMERG_LOG("could not install signal handlers\n");
-       exit(EXIT_FAILURE);

 }
 
 static void command_pre_select(struct sched *s, struct task *t)
 }
 
 static void command_pre_select(struct sched *s, struct task *t)


@@ -382,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++;
        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
        /* 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


@@ -448,35 +439,6 @@ err:
        exit(EXIT_FAILURE);
 }
 
        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];
 static int init_afs(void)
 {
        int ret, afs_server_socket[2];


@@ -484,7 +446,8 @@ static int init_afs(void)
        ret = socketpair(PF_UNIX, SOCK_DGRAM, 0, afs_server_socket);
        if (ret < 0)
                exit(EXIT_FAILURE);
        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);
        mmd->afs_pid = fork();
        if (mmd->afs_pid < 0)
                exit(EXIT_FAILURE);


@@ -520,7 +483,7 @@ static void server_init(int argc, char **argv)
        int afs_socket;
 
        valid_fd_012();
        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);
        /* parse command line options */
        server_cmdline_parser_ext(argc, argv, &conf, &params);
        HANDLE_VERSION_FLAG("server", conf);


@@ -546,19 +509,13 @@ static void server_init(int argc, char **argv)
         * before the child gets a chance to ignore this signal -- only the
         * good die young.
         */
         * before the child gets a chance to ignore this signal -- only the
         * good die young.
         */

-       if (signal(SIGUSR1, SIG_IGN) == SIG_ERR) {
-               PARA_EMERG_LOG("failed to ignore SIGUSR1\n");
-               exit(EXIT_FAILURE);
-       }
+       para_sigaction(SIGUSR1, SIG_IGN);

        /*
         * We have to install a SIGCHLD handler before the afs process is being
         * forked off. Otherwise, para_server does not notice if afs dies before
         * the SIGCHLD handler has been installed by init_signal_task() below.
         */
        /*
         * We have to install a SIGCHLD handler before the afs process is being
         * forked off. Otherwise, para_server does not notice if afs dies before
         * the SIGCHLD handler has been installed by init_signal_task() below.
         */

-       if (signal(SIGCHLD, tmp_sigchld_handler) == SIG_ERR) {
-               PARA_EMERG_LOG("failed to install temporary SIGCHLD handler\n");
-               exit(EXIT_FAILURE);
-       }
+       para_sigaction(SIGCHLD, tmp_sigchld_handler);

        PARA_NOTICE_LOG("initializing the audio file selector\n");
        afs_socket = init_afs();
        init_signal_task();
        PARA_NOTICE_LOG("initializing the audio file selector\n");
        afs_socket = init_afs();
        init_signal_task();