upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix bug#632: unbound fails to build on AArch64, protects

Browse source 
getentropy compat code from calling sysctl if it is has been removed.


git-svn-id: file:///svn/unbound/trunk@3287 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2014-12-02 00:19:42 +00:00
parent 988dad4dda
commit 3280937577
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
compat/getentropy_linux.c
View file

@ -78,7 +78,7 @@ extern int main(int, char *argv[]);
#endif #endif
static int gotdata(char *buf, size_t len); static int gotdata(char *buf, size_t len);
static int getentropy_urandom(void *buf, size_t len); static int getentropy_urandom(void *buf, size_t len);
#ifdef CTL_MAXNAME #ifdef SYS__sysctl
static int getentropy_sysctl(void *buf, size_t len); static int getentropy_sysctl(void *buf, size_t len);
#endif #endif
static int getentropy_fallback(void *buf, size_t len); static int getentropy_fallback(void *buf, size_t len);
@ -103,7 +103,7 @@ getentropy(void *buf, size_t len)
if (ret != -1) if (ret != -1)
return (ret); return (ret);
#ifdef CTL_MAXNAME #ifdef SYS__sysctl
/* /*
* Try to use sysctl CTL_KERN, KERN_RANDOM, RANDOM_UUID. * Try to use sysctl CTL_KERN, KERN_RANDOM, RANDOM_UUID.
* sysctl is a failsafe API, so it guarantees a result. This * sysctl is a failsafe API, so it guarantees a result. This
@ -125,7 +125,7 @@ getentropy(void *buf, size_t len)
ret = getentropy_sysctl(buf, len); ret = getentropy_sysctl(buf, len);
if (ret != -1) if (ret != -1)
return (ret); return (ret);
#endif /* CTL_MAXNAME */ #endif /* SYS__sysctl */
/* /*
* Entropy collection via /dev/urandom and sysctl have failed. * Entropy collection via /dev/urandom and sysctl have failed.
@ -236,7 +236,7 @@ nodevrandom:
return -1; return -1;
} }
#ifdef CTL_MAXNAME #ifdef SYS__sysctl
static int static int
getentropy_sysctl(void *buf, size_t len) getentropy_sysctl(void *buf, size_t len)
{ {
@ -266,7 +266,7 @@ sysctlfailed:
errno = EIO; errno = EIO;
return -1; return -1;
} }
#endif /* CTL_MAXNAME */ #endif /* SYS__sysctl */
static int cl[] = { static int cl[] = {
CLOCK_REALTIME, CLOCK_REALTIME,

4
doc/Changelog
View file

@ -1,3 +1,7 @@
1 December 2014: Wouter
- Fix bug#632: unbound fails to build on AArch64, protects
getentropy compat code from calling sysctl if it is has been removed.
29 November 2014: Wouter 29 November 2014: Wouter
- Add include to getentropy_linux.c, hopefully fixing debian build. - Add include to getentropy_linux.c, hopefully fixing debian build.