diff options
| author | Xin Li <delphij@FreeBSD.org> | 2018-08-27 11:32:51 +0200 |
|---|---|---|
| committer | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2018-08-27 11:34:39 +0200 |
| commit | 6523b984f03bc9de3edae2db65c1c54837e730a8 (patch) | |
| tree | d815704f7438694395482c8afd3cfab61431d392 /src/OS | |
| parent | 88752192a16ea6f8f8bf4d3b3f801e20d49e5398 (diff) | |
Do not use arc4random_stir() directly (Bug 2304)
arc4random_stir should not be used directly (it's fully automated after
FreeBSD r227520, or approximately __FreeBSD_version 1000002), the
interface will be removed from FreeBSD soon (bugs.freebsd.org/230756).
Patch was from bugs.freebsd.org/230826.
Diffstat (limited to 'src/OS')
| -rw-r--r-- | src/OS/os.h-FreeBSD | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/OS/os.h-FreeBSD b/src/OS/os.h-FreeBSD index a1c84f31c..4f1c616f0 100644 --- a/src/OS/os.h-FreeBSD +++ b/src/OS/os.h-FreeBSD @@ -4,6 +4,7 @@ #include <sys/types.h> +#include <sys/param.h> #define HAVE_BSD_GETLOADAVG #define HAVE_SETCLASSRESOURCES @@ -13,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 @@ -36,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. */ |