diff options
| author |   deraadt <deraadt@openbsd.org> | 2014-07-12 14:46:31 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2014-07-12 14:46:31 +0000 |
| commit | 190c328c9346ccad7768e1b12b9c51fe545177d4 (patch) | |
| tree | d001182cee89dab49af24f9382354341fb9892b3 /lib/libcrypto/arc4random/getentropy_solaris.c | |
| parent | Correct the sentence in the BUGS section. Colon chars are usable as a (diff) | |
| download | wireguard-openbsd-190c328c9346ccad7768e1b12b9c51fe545177d4.tar.xz wireguard-openbsd-190c328c9346ccad7768e1b12b9c51fe545177d4.zip | |
remove gratuitous differences, ok beck bcook
Diffstat (limited to 'lib/libcrypto/arc4random/getentropy_solaris.c')
| -rw-r--r-- | lib/libcrypto/arc4random/getentropy_solaris.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/libcrypto/arc4random/getentropy_solaris.c b/lib/libcrypto/arc4random/getentropy_solaris.c index 13afe7e3c9b..83cc30aac2a 100644 --- a/lib/libcrypto/arc4random/getentropy_solaris.c +++ b/lib/libcrypto/arc4random/getentropy_solaris.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getentropy_solaris.c,v 1.2 2014/07/12 13:19:44 beck Exp $ */ +/* $OpenBSD: getentropy_solaris.c,v 1.3 2014/07/12 14:46:31 deraadt Exp $ */ /* * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org> @@ -43,7 +43,6 @@ #define SHA512_Update SHA512Update #define SHA512_Final SHA512Final - #include <sys/vfs.h> #include <sys/statfs.h> #include <sys/loadavg.h> @@ -81,7 +80,7 @@ getentropy(void *buf, size_t len) } /* - * Try to get entropy with /dev/urandom... + * Try to get entropy with /dev/urandom * * Solaris provides /dev/urandom as a symbolic link to * /devices/pseudo/random@0:urandom which is provided by @@ -132,8 +131,8 @@ getentropy(void *buf, size_t len) * providing a new failsafe API which works in a chroot or * when file descriptors are exhausted. */ -#undef FAIL_WHEN_SYSTEM_ENTROPY_FAILS -#ifdef FAIL_WHEN_SYSTEM_ENTROPY_FAILS +#undef FAIL_INSTEAD_OF_TRYING_FALLBACK +#ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK raise(SIGKILL); #endif ret = getentropy_fallback(buf, len); @@ -215,7 +214,7 @@ nodevrandom: return -1; } -static int cl[] = { +static const int cl[] = { CLOCK_REALTIME, #ifdef CLOCK_MONOTONIC CLOCK_MONOTONIC, @@ -279,6 +278,7 @@ getentropy_fallback(void *buf, size_t len) for (ii = 0; ii < sizeof(cl)/sizeof(cl[0]); ii++) HX(clock_gettime(cl[ii], &ts) == -1, ts); + HX((pid = getpid()) == -1, pid); HX((pid = getsid(pid)) == -1, pid); HX((pid = getppid()) == -1, pid); |