wg: always fallback to /dev/urandom

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2016-07-03 20:39:47 +02:00
parent 742f038fc2
commit be4f3cd7c2

View file

@ -6,31 +6,29 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <syscall.h> #include <syscall.h>
#include <unistd.h>
#include <string.h> #include <string.h>
#include <fcntl.h>
#include "curve25519.h" #include "curve25519.h"
#include "base64.h" #include "base64.h"
#include "subcommands.h" #include "subcommands.h"
#ifdef __NR_getrandom
static inline ssize_t get_random_bytes(uint8_t *out, size_t len)
{
return syscall(__NR_getrandom, out, len, 0);
}
#else
#include <fcntl.h>
static inline ssize_t get_random_bytes(uint8_t *out, size_t len) static inline ssize_t get_random_bytes(uint8_t *out, size_t len)
{ {
ssize_t ret; ssize_t ret;
int fd = open("/dev/urandom", O_RDONLY); int fd;
#ifdef __NR_getrandom
ret = syscall(__NR_getrandom, out, len, 0);
if (ret >= 0)
return ret;
#endif
fd = open("/dev/urandom", O_RDONLY);
if (fd < 0) if (fd < 0)
return fd; return fd;
ret = read(fd, out, len); ret = read(fd, out, len);
close(fd); close(fd);
return ret; return ret;
} }
#endif
int genkey_main(int argc, char *argv[]) int genkey_main(int argc, char *argv[])
{ {