Do not use arc4random_stir() directly (Bug 2304)

[users/jgh/exim.git] / src / OS / os.h-FreeBSD

diff --git a/src/OS/os.h-FreeBSD b/src/OS/os.h-FreeBSD
index 7cb836cbebb35360f87db2a289d8545e655c7fab..4f1c616f090237c74429aa11eae77f07d2bad3a1 100644 (file)
--- a/src/OS/os.h-FreeBSD
+++ b/src/OS/os.h-FreeBSD
@@ -1,6 +1,10 @@
 /* Exim: OS-specific C header file for FreeBSD */
+/* Copyright (c) University of Cambridge 1995 - 2018 */
+/* See the file NOTICE for conditions of use and distribution. */
+
 
 #include <sys/types.h>
+#include <sys/param.h>
 
 #define HAVE_BSD_GETLOADAVG
 #define HAVE_SETCLASSRESOURCES
@@ -10,6 +14,14 @@
 #define HAVE_SRANDOMDEV
 #define HAVE_ARC4RANDOM
 
+/* Applications should not call arc4random_stir() explicitly after
+ * FreeBSD r227520 (approximately 1000002).
+ * Set NOT_HAVE_ARC4RANDOM_STIR if the version released is past
+ * that point. */
+#if __FreeBSD_version >= 1000002
+# define NOT_HAVE_ARC4RANDOM_STIR
+#endif
+
 typedef struct flock flock_t;
 
 /* iconv arg2 type: libiconv in Ports uses "const char* * inbuf" and was
@@ -33,9 +45,8 @@ typedef struct flock flock_t;
 #if __FreeBSD__ >= 10
 # define LIBICONV_PLUG
 #endif
-/* for more specific version constraints, include <sys/param.h> and look at
- * __FreeBSD_version */
-
+/* for more specific version constraints, look at __FreeBSD_version
+ * from <sys/param.h> */
 
 /* When using DKIM, setting OS_SENDFILE can increase
 performance on outgoing mail a bit. */
@@ -55,7 +66,7 @@ MSG_FASTOPEN defined yet... */
 #if defined(TCP_FASTOPEN) && !defined(MSG_FASTOPEN)
 # define MSG_FASTOPEN 0x20000000
 #endif
- 
+
 /* for TCP state-variable values, for TFO logging */
 #include <netinet/tcp_fsm.h>
 #define TCP_SYN_RECV TCPS_SYN_RECEIVED