diff options
Diffstat (limited to 'main.c')
| -rw-r--r-- | main.c | 18 |
1 files changed, 10 insertions, 8 deletions
@@ -18,6 +18,7 @@ #include <openssl/err.h> #include <openssl/rand.h> #include <dynstr.h> +#include <sodium.h> #include <dirent.h> #include <libgen.h> #include <fcntl.h> @@ -522,13 +523,9 @@ static char *create_symlink(const char *const dir, const char *user) dynstr_init(&abs); dynstr_init(&rel); - if (RAND_bytes(buf, sizeof buf) != 1) - { - fprintf(stderr, "%s: RAND_bytes failed with %lu\n", - __func__, ERR_get_error()); - goto end; - } - else if (hex_encode(buf, dbuf, sizeof buf, sizeof dbuf)) + randombytes_buf(buf, sizeof buf); + + if (hex_encode(buf, dbuf, sizeof buf, sizeof dbuf)) { fprintf(stderr, "%s: hex_encode failed\n", __func__); goto end; @@ -2650,7 +2647,12 @@ int main(int argc, char *argv[]) dynstr_init(&ua.d); - if (parse_args(argc, argv, &dir, &port, &tmpdir, &ua.fifo) + if (sodium_init()) + { + fprintf(stderr, "%s: sodium_init failed\n", __func__); + goto end; + } + else if (parse_args(argc, argv, &dir, &port, &tmpdir, &ua.fifo) || init_dirs(dir) || ensure_style(dir) || !(ua.a = auth_alloc(dir)) |