Fix UNIX_PATH_MAX on NetBSD.

[paraslash.git] / crypt.c

diff --git a/crypt.c b/crypt.c
index f064fb3a535d9df3306818d7e9c27ca85193bd50..7b7c16d348952dab0dccbbd2170af178a703adb3 100644 (file)
--- a/crypt.c
+++ b/crypt.c
@@ -204,7 +204,7 @@ out:
                ret = ret2;
        if (ret < 0) {
                free(key);
-               result = NULL;
+               *result = NULL;
                PARA_ERROR_LOG("key %s: %s\n", key_file, para_strerror(-ret));
        } else
                *result = key;
@@ -306,7 +306,7 @@ int sc_send_bin_buffer(struct stream_cipher_context *scc, char *buf,
 int sc_recv_bin_buffer(struct stream_cipher_context *scc, char *buf,
                size_t size)
 {
-       unsigned char *tmp = para_malloc(size);
+       unsigned char *tmp = para_malloc(ROUND_UP(size, RC4_ALIGN));
        ssize_t ret = recv(scc->fd, tmp, size, 0);
 
        if (ret > 0)