interesting
/
getdns
mirror of https://github.com/getdnsapi/getdns.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Without dl_iterate_phdr for now...

This commit is contained in:
Willem Toorop 2018-05-03 11:40:44 +02:00
parent f5c588c955
commit de7f007bf3
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/compat/getentropy_linux.c
View File

@ -19,8 +19,12 @@
* Emulation of getentropy(2) as documented at: * Emulation of getentropy(2) as documented at:
* http://man.openbsd.org/getentropy.2 * http://man.openbsd.org/getentropy.2
*/ */
/* #define WITH_DL_ITERATE_PHDR 1 */
#ifdef WITH_DL_ITERATE_PHDR
#define _GNU_SOURCE 1 #define _GNU_SOURCE 1
#define _POSIX_C_SOURCE 199309L #define _POSIX_C_SOURCE 199309L
#endif
#include "config.h" #include "config.h"
#include <sys/types.h> #include <sys/types.h>
@ -40,7 +44,9 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
#ifdef WITH_DL_ITERATE_PHDR
#include <link.h> #include <link.h>
#endif
#include <termios.h> #include <termios.h>
#include <fcntl.h> #include <fcntl.h>
#include <signal.h> #include <signal.h>
@ -102,7 +108,9 @@ static int getentropy_urandom(void *buf, size_t len);
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);
#ifdef WITH_DL_ITERATE_PHDR
static int getentropy_phdr(struct dl_phdr_info *info, size_t size, void *data); static int getentropy_phdr(struct dl_phdr_info *info, size_t size, void *data);
#endif
int int
getentropy(void *buf, size_t len) getentropy(void *buf, size_t len)
@ -347,6 +355,7 @@ static const int cl[] = {
#endif #endif
}; };
#ifdef WITH_DL_ITERATE_PHDR
static int static int
getentropy_phdr(struct dl_phdr_info *info, size_t size, void *data) getentropy_phdr(struct dl_phdr_info *info, size_t size, void *data)
{ {
@ -355,6 +364,7 @@ getentropy_phdr(struct dl_phdr_info *info, size_t size, void *data)
CRYPTO_SHA512_UPDATE(ctx, &info->dlpi_addr, sizeof (info->dlpi_addr)); CRYPTO_SHA512_UPDATE(ctx, &info->dlpi_addr, sizeof (info->dlpi_addr));
return (0); return (0);
} }
#endif
static int static int
getentropy_fallback(void *buf, size_t len) getentropy_fallback(void *buf, size_t len)
@ -392,7 +402,9 @@ getentropy_fallback(void *buf, size_t len)
cnt += (int)tv.tv_usec; cnt += (int)tv.tv_usec;
} }
#ifdef WITH_DL_ITERATE_PHDR
dl_iterate_phdr(getentropy_phdr, &ctx); dl_iterate_phdr(getentropy_phdr, &ctx);
#endif
for (ii = 0; ii < sizeof(cl)/sizeof(cl[0]); ii++) for (ii = 0; ii < sizeof(cl)/sizeof(cl[0]); ii++)
HX(clock_gettime(cl[ii], &ts) == -1, ts); HX(clock_gettime(cl[ii], &ts) == -1, ts);