From: Jason A. Donenfeld <Jason@zx2c4.com>
Date: Sun, 3 Jul 2016 18:39:47 +0000 (+0200)
Subject: wg: always fallback to /dev/urandom
X-Git-Tag: v1.0.20191226~352
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=be4f3cd7c2df12f219d3e6a40559602a053df4e2;p=thirdparty%2Fwireguard-tools.git

wg: always fallback to /dev/urandom

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---

diff --git a/src/genkey.c b/src/genkey.c
index 8e63108..a312b46 100644
--- a/src/genkey.c
+++ b/src/genkey.c
@@ -6,31 +6,29 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <syscall.h>
-#include <unistd.h>
 #include <string.h>
+#include <fcntl.h>
 
 #include "curve25519.h"
 #include "base64.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)
 {
 	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)
 		return fd;
 	ret = read(fd, out, len);
 	close(fd);
 	return ret;
 }
-#endif
 
 int genkey_main(int argc, char *argv[])
 {