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

- Patch from Brad Smith that syncs compat/getentropy_linux with

Browse source 
OpenBSD's version (2015-03-04).


git-svn-id: file:///svn/unbound/trunk@3345 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2015-03-04 07:18:09 +00:00
parent bd05a6de8c
commit 34283df859
2 changed files with 34 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
compat/getentropy_linux.c
View file

@ -77,6 +77,9 @@ int getentropy(void *buf, size_t len);
extern int main(int, char *argv[]); extern int main(int, char *argv[]);
#endif #endif
static int gotdata(char *buf, size_t len); static int gotdata(char *buf, size_t len);
#ifdef SYS_getrandom
static int getentropy_getrandom(void *buf, size_t len);
#endif
static int getentropy_urandom(void *buf, size_t len); static int getentropy_urandom(void *buf, size_t len);
#ifdef SYS__sysctl #ifdef SYS__sysctl
static int getentropy_sysctl(void *buf, size_t len); static int getentropy_sysctl(void *buf, size_t len);
@ -94,11 +97,15 @@ getentropy(void *buf, size_t len)
} }
#ifdef SYS_getrandom #ifdef SYS_getrandom
/* try to use getrandom syscall introduced with kernel 3.17 */ /*
ret = syscall(SYS_getrandom, buf, len, 0); * Try descriptor-less getrandom()
*/
ret = getentropy_getrandom(buf, len);
if (ret != -1) if (ret != -1)
return (ret); return (ret);
#endif /* SYS_getrandom */ if (errno != ENOSYS)
return (-1);
#endif
/* /*
* Try to get entropy with /dev/urandom * Try to get entropy with /dev/urandom
@ -185,6 +192,25 @@ gotdata(char *buf, size_t len)
return 0; return 0;
} }
#ifdef SYS_getrandom
static int
getentropy_getrandom(void *buf, size_t len)
{
int pre_errno = errno;
int ret;
if (len > 256)
return (-1);
do {
ret = syscall(SYS_getrandom, buf, len, 0);
} while (ret == -1 && errno == EINTR);
if (ret != len)
return (-1);
errno = pre_errno;
return (0);
}
#endif
static int static int
getentropy_urandom(void *buf, size_t len) getentropy_urandom(void *buf, size_t len)
{ {
@ -258,7 +284,7 @@ getentropy_sysctl(void *buf, size_t len)
struct __sysctl_args args = { struct __sysctl_args args = {
.name = mib, .name = mib,
.nlen = 3, .nlen = 3,
.oldval = buf + i, .oldval = (char *)buf + i,
.oldlenp = &chunk, .oldlenp = &chunk,
}; };
if (syscall(SYS__sysctl, &args) != 0) if (syscall(SYS__sysctl, &args) != 0)

4
doc/Changelog
View file

@ -1,3 +1,7 @@
4 March 2015: Wouter
- Patch from Brad Smith that syncs compat/getentropy_linux with
OpenBSD's version (2015-03-04).
3 March 2015: Wouter 3 March 2015: Wouter
- tag 1.5.3rc1 - tag 1.5.3rc1