upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2026-01-19 13:12:55 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Making getentropy the same across platforms.

Browse source 
git-svn-id: file:///svn/unbound/trunk@3185 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2014-07-12 18:58:11 +00:00
parent 3263e5f238
commit 3a29c07839
3 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
compat/getentropy_linux.c
View file

@ -215,7 +215,7 @@ start:
}
for (i = 0; i < len; ) {
size_t wanted = len - i;
ssize_t ret = read(fd, buf + i, wanted);
ssize_t ret = read(fd, (char*)buf + i, wanted);
if (ret == -1) {
if (errno == EAGAIN || errno == EINTR)
@ -489,7 +489,7 @@ getentropy_fallback(void *buf, size_t len)
#endif
SHA512_Final(results, &ctx);
memcpy(buf + i, results, min(sizeof(results), len - i));
memcpy((char*)buf + i, results, min(sizeof(results), len - i));
i += min(sizeof(results), len - i);
}
memset(results, 0, sizeof results);

10
compat/getentropy_osx.c
View file

@ -75,8 +75,7 @@
int getentropy(void *buf, size_t len);
/* cannot reference main, or log_info for unbound, it
gives portability problems */
/* referencing functions in other link modules is not portable */
/*extern int main(int, char *argv[]);*/
static int gotdata(char *buf, size_t len);
static int getentropy_urandom(void *buf, size_t len);
@ -188,7 +187,7 @@ start:
}
for (i = 0; i < len; ) {
size_t wanted = len - i;
ssize_t ret = read(fd, buf + i, wanted);
ssize_t ret = read(fd, (char*)buf + i, wanted);
if (ret == -1) {
if (errno == EAGAIN || errno == EINTR)
@ -235,7 +234,7 @@ getentropy_fallback(void *buf, size_t len)
struct ipstat ipstat;
u_int64_t mach_time;
unsigned int idata;
void * addr;
void *addr;
pid = getpid();
if (lastpid == pid) {
@ -295,7 +294,6 @@ getentropy_fallback(void *buf, size_t len)
HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1,
sigset);
/* using log_info instead of main for unbound */
/*HF(main);*/ /* an addr in program */
HF(getentropy); /* an addr in this library */
HF(printf); /* an addr in libc */
@ -418,7 +416,7 @@ getentropy_fallback(void *buf, size_t len)
}
SHA512_Final(results, &ctx);
memcpy(buf + i, results, min(sizeof(results), len - i));
memcpy((char*)buf + i, results, min(sizeof(results), len - i));
i += min(sizeof(results), len - i);
}
memset(results, 0, sizeof results);

6
compat/getentropy_solaris.c
View file

@ -61,14 +61,12 @@
#define HR(x, l) (SHA512_Update(&ctx, (char *)(x), (l)))
#define HD(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (x)))
/* for functions. sun-cc cannot take sizeof a function pointer */
/* (portability) some compilers cannot take sizeof a function pointer */
#define HF(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (void*)))
int getentropy(void *buf, size_t len);
/* cannot refernce main, or log_info for unbound, it gives
portability problems. For solaris specifically, sun-cc and gcc
have different link semantics (but it also fails on other platforms) */
/* referencing functions in other link modules is not portable */
/* extern int main(int, char *argv[]); */
static int gotdata(char *buf, size_t len);
static int getentropy_urandom(void *buf, size_t len, const char *path,