From 46ea86584a9787c8b9dc3983cf23d9b5b93b5841 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 21 Jun 2024 14:29:17 +0300
Subject: fixes #4477 (libsodium: update to 1.0.20)

---
 .../randombytes/sysrandom/randombytes_sysrandom.c  | 31 +++++++++++++---------
 1 file changed, 18 insertions(+), 13 deletions(-)

(limited to 'libs/libsodium/src/randombytes/sysrandom')

diff --git a/libs/libsodium/src/randombytes/sysrandom/randombytes_sysrandom.c b/libs/libsodium/src/randombytes/sysrandom/randombytes_sysrandom.c
index d1439bf7fc..75fbca9dab 100644
--- a/libs/libsodium/src/randombytes/sysrandom/randombytes_sysrandom.c
+++ b/libs/libsodium/src/randombytes/sysrandom/randombytes_sysrandom.c
@@ -1,4 +1,3 @@
-
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -8,29 +7,35 @@
 #ifndef _WIN32
 # include <unistd.h>
 #endif
-
 #include <stdlib.h>
+
 #include <sys/types.h>
 #ifndef _WIN32
 # include <sys/stat.h>
 # include <sys/time.h>
 #endif
 #ifdef __linux__
-# ifdef __dietlibc__
-#  define _LINUX_SOURCE
-#  include <sys/random.h>
+# define _LINUX_SOURCE
+#endif
+#ifdef HAVE_SYS_RANDOM_H
+# include <sys/random.h>
+#endif
+#ifdef __linux__
+# ifdef HAVE_GETRANDOM
 #  define HAVE_LINUX_COMPATIBLE_GETRANDOM
-# else /* __dietlibc__ */
+# else
 #  include <sys/syscall.h>
 #  if defined(SYS_getrandom) && defined(__NR_getrandom)
 #   define getrandom(B, S, F) syscall(SYS_getrandom, (B), (int) (S), (F))
 #   define HAVE_LINUX_COMPATIBLE_GETRANDOM
 #  endif
-# endif /* __dietlibc */
-#elif defined(__FreeBSD__)
+# endif
+#elif defined(__midipix__)
+# define HAVE_LINUX_COMPATIBLE_GETRANDOM
+#elif defined(__FreeBSD__) || defined(__DragonFly__)
 # include <sys/param.h>
-# if defined(__FreeBSD_version) && __FreeBSD_version >= 1200000
-#  include <sys/random.h>
+# if (defined(__FreeBSD_version) && __FreeBSD_version >= 1200000) || \
+     (defined(__DragonFly_version) && __DragonFly_version >= 500700)
 #  define HAVE_LINUX_COMPATIBLE_GETRANDOM
 # endif
 #endif
@@ -72,7 +77,7 @@ BOOLEAN NTAPI RtlGenRandom(PVOID RandomBuffer, ULONG RandomBufferLength);
 # pragma comment(lib, "advapi32.lib")
 #endif
 
-#if defined(__OpenBSD__) || defined(__CloudABI__)
+#if defined(__OpenBSD__) || defined(__CloudABI__) || defined(__wasi__)
 # define HAVE_SAFE_ARC4RANDOM 1
 #endif
 
@@ -105,7 +110,7 @@ randombytes_sysrandom_close(void)
     return 0;
 }
 
-#else /* __OpenBSD__ */
+#else /* HAVE_SAFE_ARC4RANDOM */
 
 typedef struct SysRandom_ {
     int random_data_source_fd;
@@ -375,7 +380,7 @@ randombytes_sysrandom(void)
     return r;
 }
 
-#endif /* __OpenBSD__ */
+#endif /* HAVE_SAFE_ARC4RANDOM */
 
 static const char *
 randombytes_sysrandom_implementation_name(void)
-- 
cgit v1.2.3