Fincer
/
openntpd-openbsd
mirror of https://github.com/Fincer/openntpd-openbsd
1
0
Fork 0
Code Issues 0 Projects 0 Releases 61 Wiki Activity
Browse Source

Remove signed/unsigned warning, statement before declaration and 

add a function to use function pointers that does not take sizeof(fptr).
OK beck@
OPENBSD_5_6
wouter 10 years ago
parent
9b1d48d8cc
commit
ca0c9eb852
6 changed files with 64 additions and 58 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +12
    -11
      src/lib/libcrypto/arc4random/getentropy_linux.c
  2. +10
    -9
      src/lib/libcrypto/arc4random/getentropy_osx.c
  3. +10
    -9
      src/lib/libcrypto/arc4random/getentropy_solaris.c
  4. +12
    -11
      src/lib/libcrypto/crypto/getentropy_linux.c
  5. +10
    -9
      src/lib/libcrypto/crypto/getentropy_osx.c
  6. +10
    -9
      src/lib/libcrypto/crypto/getentropy_solaris.c

+ 12
- 11
src/lib/libcrypto/arc4random/getentropy_linux.c View File

@ -1,4 +1,4 @@
/* $OpenBSD: getentropy_linux.c,v 1.20 2014/07/12 15:43:49 beck Exp $ */
/* $OpenBSD: getentropy_linux.c,v 1.21 2014/07/12 20:41:47 wouter Exp $ */
/* /*
* Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org> * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org>
@ -65,6 +65,7 @@
#define HR(x, l) (SHA512_Update(&ctx, (char *)(x), (l))) #define HR(x, l) (SHA512_Update(&ctx, (char *)(x), (l)))
#define HD(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (x))) #define HD(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (x)))
#define HF(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (void*)))
int getentropy(void *buf, size_t len); int getentropy(void *buf, size_t len);
@ -209,7 +210,7 @@ start:
} }
for (i = 0; i < len; ) { for (i = 0; i < len; ) {
size_t wanted = len - i; 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 (ret == -1) {
if (errno == EAGAIN || errno == EINTR) if (errno == EAGAIN || errno == EINTR)
@ -234,11 +235,11 @@ static int
getentropy_sysctl(void *buf, size_t len) getentropy_sysctl(void *buf, size_t len)
{ {
static int mib[] = { CTL_KERN, KERN_RANDOM, RANDOM_UUID }; static int mib[] = { CTL_KERN, KERN_RANDOM, RANDOM_UUID };
size_t i, chunk;
size_t i;
int save_errno = errno; int save_errno = errno;
for (i = 0; i < len; ) { for (i = 0; i < len; ) {
chunk = min(len - i, 16);
size_t chunk = min(len - i, 16);
/* SYS__sysctl because some systems already removed sysctl() */ /* SYS__sysctl because some systems already removed sysctl() */
struct __sysctl_args args = { struct __sysctl_args args = {
@ -290,7 +291,7 @@ static int
getentropy_fallback(void *buf, size_t len) getentropy_fallback(void *buf, size_t len)
{ {
uint8_t results[SHA512_DIGEST_LENGTH]; uint8_t results[SHA512_DIGEST_LENGTH];
int save_errno = errno, e, m, pgs = getpagesize(), faster = 0, repeat;
int save_errno = errno, e, pgs = getpagesize(), faster = 0, repeat;
static int cnt; static int cnt;
struct timespec ts; struct timespec ts;
struct timeval tv; struct timeval tv;
@ -300,7 +301,7 @@ getentropy_fallback(void *buf, size_t len)
SHA512_CTX ctx; SHA512_CTX ctx;
static pid_t lastpid; static pid_t lastpid;
pid_t pid; pid_t pid;
size_t i, ii;
size_t i, ii, m;
char *p; char *p;
pid = getpid(); pid = getpid();
@ -329,7 +330,7 @@ getentropy_fallback(void *buf, size_t len)
HX((pid = getsid(pid)) == -1, pid); HX((pid = getsid(pid)) == -1, pid);
HX((pid = getppid()) == -1, pid); HX((pid = getppid()) == -1, pid);
HX((pid = getpgid(0)) == -1, pid); HX((pid = getpgid(0)) == -1, pid);
HX((m = getpriority(0, 0)) == -1, m);
HX((e = getpriority(0, 0)) == -1, e);
if (!faster) { if (!faster) {
ts.tv_sec = 0; ts.tv_sec = 0;
@ -341,9 +342,9 @@ getentropy_fallback(void *buf, size_t len)
HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1, HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1,
sigset); sigset);
HD(main); /* an addr in program */
HD(getentropy); /* an addr in this library */
HD(printf); /* an addr in libc */
HF(main); /* an addr in program */
HF(getentropy); /* an addr in this library */
HF(printf); /* an addr in libc */
p = (char *)&p; p = (char *)&p;
HD(p); /* an addr on stack */ HD(p); /* an addr on stack */
p = (char *)&errno; p = (char *)&errno;
@ -483,7 +484,7 @@ getentropy_fallback(void *buf, size_t len)
#endif #endif
SHA512_Final(results, &ctx); 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); i += min(sizeof(results), len - i);
} }
memset(results, 0, sizeof results); memset(results, 0, sizeof results);


+ 10
- 9
src/lib/libcrypto/arc4random/getentropy_osx.c View File

@ -1,4 +1,4 @@
/* $OpenBSD: getentropy_osx.c,v 1.3 2014/07/12 14:48:00 deraadt Exp $ */
/* $OpenBSD: getentropy_osx.c,v 1.4 2014/07/12 20:41:47 wouter Exp $ */
/* /*
* Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org> * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org>
@ -70,6 +70,7 @@
#define HR(x, l) (SHA512_Update(&ctx, (char *)(x), (l))) #define HR(x, l) (SHA512_Update(&ctx, (char *)(x), (l)))
#define HD(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (x))) #define HD(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (x)))
#define HF(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (void*)))
int getentropy(void *buf, size_t len); int getentropy(void *buf, size_t len);
@ -184,7 +185,7 @@ start:
} }
for (i = 0; i < len; ) { for (i = 0; i < len; ) {
size_t wanted = len - i; 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 (ret == -1) {
if (errno == EAGAIN || errno == EINTR) if (errno == EAGAIN || errno == EINTR)
@ -214,7 +215,7 @@ static int
getentropy_fallback(void *buf, size_t len) getentropy_fallback(void *buf, size_t len)
{ {
uint8_t results[SHA512_DIGEST_LENGTH]; uint8_t results[SHA512_DIGEST_LENGTH];
int save_errno = errno, e, m, pgs = getpagesize(), faster = 0, repeat;
int save_errno = errno, e, pgs = getpagesize(), faster = 0, repeat;
static int cnt; static int cnt;
struct timespec ts; struct timespec ts;
struct timeval tv; struct timeval tv;
@ -224,7 +225,7 @@ getentropy_fallback(void *buf, size_t len)
SHA512_CTX ctx; SHA512_CTX ctx;
static pid_t lastpid; static pid_t lastpid;
pid_t pid; pid_t pid;
size_t i, ii;
size_t i, ii, m;
char *p; char *p;
struct tcpstat tcpstat; struct tcpstat tcpstat;
struct udpstat udpstat; struct udpstat udpstat;
@ -279,7 +280,7 @@ getentropy_fallback(void *buf, size_t len)
HX((pid = getsid(pid)) == -1, pid); HX((pid = getsid(pid)) == -1, pid);
HX((pid = getppid()) == -1, pid); HX((pid = getppid()) == -1, pid);
HX((pid = getpgid(0)) == -1, pid); HX((pid = getpgid(0)) == -1, pid);
HX((m = getpriority(0, 0)) == -1, m);
HX((e = getpriority(0, 0)) == -1, e);
if (!faster) { if (!faster) {
ts.tv_sec = 0; ts.tv_sec = 0;
@ -291,9 +292,9 @@ getentropy_fallback(void *buf, size_t len)
HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1, HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1,
sigset); sigset);
HD(main); /* an addr in program */
HD(getentropy); /* an addr in this library */
HD(printf); /* an addr in libc */
HF(main); /* an addr in program */
HF(getentropy); /* an addr in this library */
HF(printf); /* an addr in libc */
p = (char *)&p; p = (char *)&p;
HD(p); /* an addr on stack */ HD(p); /* an addr on stack */
p = (char *)&errno; p = (char *)&errno;
@ -413,7 +414,7 @@ getentropy_fallback(void *buf, size_t len)
} }
SHA512_Final(results, &ctx); 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); i += min(sizeof(results), len - i);
} }
memset(results, 0, sizeof results); memset(results, 0, sizeof results);


+ 10
- 9
src/lib/libcrypto/arc4random/getentropy_solaris.c View File

@ -1,4 +1,4 @@
/* $OpenBSD: getentropy_solaris.c,v 1.3 2014/07/12 14:46:31 deraadt Exp $ */
/* $OpenBSD: getentropy_solaris.c,v 1.4 2014/07/12 20:41:47 wouter Exp $ */
/* /*
* Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org> * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org>
@ -60,6 +60,7 @@
#define HR(x, l) (SHA512_Update(&ctx, (char *)(x), (l))) #define HR(x, l) (SHA512_Update(&ctx, (char *)(x), (l)))
#define HD(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (x))) #define HD(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (x)))
#define HF(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (void*)))
int getentropy(void *buf, size_t len); int getentropy(void *buf, size_t len);
@ -194,7 +195,7 @@ start:
} }
for (i = 0; i < len; ) { for (i = 0; i < len; ) {
size_t wanted = len - i; 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 (ret == -1) {
if (errno == EAGAIN || errno == EINTR) if (errno == EAGAIN || errno == EINTR)
@ -243,7 +244,7 @@ static int
getentropy_fallback(void *buf, size_t len) getentropy_fallback(void *buf, size_t len)
{ {
uint8_t results[SHA512_DIGEST_LENGTH]; uint8_t results[SHA512_DIGEST_LENGTH];
int save_errno = errno, e, m, pgs = getpagesize(), faster = 0, repeat;
int save_errno = errno, e, pgs = getpagesize(), faster = 0, repeat;
static int cnt; static int cnt;
struct timespec ts; struct timespec ts;
struct timeval tv; struct timeval tv;
@ -254,7 +255,7 @@ getentropy_fallback(void *buf, size_t len)
SHA512_CTX ctx; SHA512_CTX ctx;
static pid_t lastpid; static pid_t lastpid;
pid_t pid; pid_t pid;
size_t i, ii;
size_t i, ii, m;
char *p; char *p;
pid = getpid(); pid = getpid();
@ -283,7 +284,7 @@ getentropy_fallback(void *buf, size_t len)
HX((pid = getsid(pid)) == -1, pid); HX((pid = getsid(pid)) == -1, pid);
HX((pid = getppid()) == -1, pid); HX((pid = getppid()) == -1, pid);
HX((pid = getpgid(0)) == -1, pid); HX((pid = getpgid(0)) == -1, pid);
HX((m = getpriority(0, 0)) == -1, m);
HX((e = getpriority(0, 0)) == -1, e);
HX((getloadavg(loadavg, 3) == -1), loadavg); HX((getloadavg(loadavg, 3) == -1), loadavg);
if (!faster) { if (!faster) {
@ -296,9 +297,9 @@ getentropy_fallback(void *buf, size_t len)
HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1, HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1,
sigset); sigset);
HD(main); /* an addr in program */
HD(getentropy); /* an addr in this library */
HD(printf); /* an addr in libc */
HF(main); /* an addr in program */
HF(getentropy); /* an addr in this library */
HF(printf); /* an addr in libc */
p = (char *)&p; p = (char *)&p;
HD(p); /* an addr on stack */ HD(p); /* an addr on stack */
p = (char *)&errno; p = (char *)&errno;
@ -416,7 +417,7 @@ getentropy_fallback(void *buf, size_t len)
HD(cnt); HD(cnt);
} }
SHA512_Final(results, &ctx); 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); i += min(sizeof(results), len - i);
} }
memset(results, 0, sizeof results); memset(results, 0, sizeof results);


+ 12
- 11
src/lib/libcrypto/crypto/getentropy_linux.c View File

@ -1,4 +1,4 @@
/* $OpenBSD: getentropy_linux.c,v 1.20 2014/07/12 15:43:49 beck Exp $ */
/* $OpenBSD: getentropy_linux.c,v 1.21 2014/07/12 20:41:47 wouter Exp $ */
/* /*
* Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org> * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org>
@ -65,6 +65,7 @@
#define HR(x, l) (SHA512_Update(&ctx, (char *)(x), (l))) #define HR(x, l) (SHA512_Update(&ctx, (char *)(x), (l)))
#define HD(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (x))) #define HD(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (x)))
#define HF(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (void*)))
int getentropy(void *buf, size_t len); int getentropy(void *buf, size_t len);
@ -209,7 +210,7 @@ start:
} }
for (i = 0; i < len; ) { for (i = 0; i < len; ) {
size_t wanted = len - i; 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 (ret == -1) {
if (errno == EAGAIN || errno == EINTR) if (errno == EAGAIN || errno == EINTR)
@ -234,11 +235,11 @@ static int
getentropy_sysctl(void *buf, size_t len) getentropy_sysctl(void *buf, size_t len)
{ {
static int mib[] = { CTL_KERN, KERN_RANDOM, RANDOM_UUID }; static int mib[] = { CTL_KERN, KERN_RANDOM, RANDOM_UUID };
size_t i, chunk;
size_t i;
int save_errno = errno; int save_errno = errno;
for (i = 0; i < len; ) { for (i = 0; i < len; ) {
chunk = min(len - i, 16);
size_t chunk = min(len - i, 16);
/* SYS__sysctl because some systems already removed sysctl() */ /* SYS__sysctl because some systems already removed sysctl() */
struct __sysctl_args args = { struct __sysctl_args args = {
@ -290,7 +291,7 @@ static int
getentropy_fallback(void *buf, size_t len) getentropy_fallback(void *buf, size_t len)
{ {
uint8_t results[SHA512_DIGEST_LENGTH]; uint8_t results[SHA512_DIGEST_LENGTH];
int save_errno = errno, e, m, pgs = getpagesize(), faster = 0, repeat;
int save_errno = errno, e, pgs = getpagesize(), faster = 0, repeat;
static int cnt; static int cnt;
struct timespec ts; struct timespec ts;
struct timeval tv; struct timeval tv;
@ -300,7 +301,7 @@ getentropy_fallback(void *buf, size_t len)
SHA512_CTX ctx; SHA512_CTX ctx;
static pid_t lastpid; static pid_t lastpid;
pid_t pid; pid_t pid;
size_t i, ii;
size_t i, ii, m;
char *p; char *p;
pid = getpid(); pid = getpid();
@ -329,7 +330,7 @@ getentropy_fallback(void *buf, size_t len)
HX((pid = getsid(pid)) == -1, pid); HX((pid = getsid(pid)) == -1, pid);
HX((pid = getppid()) == -1, pid); HX((pid = getppid()) == -1, pid);
HX((pid = getpgid(0)) == -1, pid); HX((pid = getpgid(0)) == -1, pid);
HX((m = getpriority(0, 0)) == -1, m);
HX((e = getpriority(0, 0)) == -1, e);
if (!faster) { if (!faster) {
ts.tv_sec = 0; ts.tv_sec = 0;
@ -341,9 +342,9 @@ getentropy_fallback(void *buf, size_t len)
HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1, HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1,
sigset); sigset);
HD(main); /* an addr in program */
HD(getentropy); /* an addr in this library */
HD(printf); /* an addr in libc */
HF(main); /* an addr in program */
HF(getentropy); /* an addr in this library */
HF(printf); /* an addr in libc */
p = (char *)&p; p = (char *)&p;
HD(p); /* an addr on stack */ HD(p); /* an addr on stack */
p = (char *)&errno; p = (char *)&errno;
@ -483,7 +484,7 @@ getentropy_fallback(void *buf, size_t len)
#endif #endif
SHA512_Final(results, &ctx); 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); i += min(sizeof(results), len - i);
} }
memset(results, 0, sizeof results); memset(results, 0, sizeof results);


+ 10
- 9
src/lib/libcrypto/crypto/getentropy_osx.c View File

@ -1,4 +1,4 @@
/* $OpenBSD: getentropy_osx.c,v 1.3 2014/07/12 14:48:00 deraadt Exp $ */
/* $OpenBSD: getentropy_osx.c,v 1.4 2014/07/12 20:41:47 wouter Exp $ */
/* /*
* Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org> * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org>
@ -70,6 +70,7 @@
#define HR(x, l) (SHA512_Update(&ctx, (char *)(x), (l))) #define HR(x, l) (SHA512_Update(&ctx, (char *)(x), (l)))
#define HD(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (x))) #define HD(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (x)))
#define HF(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (void*)))
int getentropy(void *buf, size_t len); int getentropy(void *buf, size_t len);
@ -184,7 +185,7 @@ start:
} }
for (i = 0; i < len; ) { for (i = 0; i < len; ) {
size_t wanted = len - i; 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 (ret == -1) {
if (errno == EAGAIN || errno == EINTR) if (errno == EAGAIN || errno == EINTR)
@ -214,7 +215,7 @@ static int
getentropy_fallback(void *buf, size_t len) getentropy_fallback(void *buf, size_t len)
{ {
uint8_t results[SHA512_DIGEST_LENGTH]; uint8_t results[SHA512_DIGEST_LENGTH];
int save_errno = errno, e, m, pgs = getpagesize(), faster = 0, repeat;
int save_errno = errno, e, pgs = getpagesize(), faster = 0, repeat;
static int cnt; static int cnt;
struct timespec ts; struct timespec ts;
struct timeval tv; struct timeval tv;
@ -224,7 +225,7 @@ getentropy_fallback(void *buf, size_t len)
SHA512_CTX ctx; SHA512_CTX ctx;
static pid_t lastpid; static pid_t lastpid;
pid_t pid; pid_t pid;
size_t i, ii;
size_t i, ii, m;
char *p; char *p;
struct tcpstat tcpstat; struct tcpstat tcpstat;
struct udpstat udpstat; struct udpstat udpstat;
@ -279,7 +280,7 @@ getentropy_fallback(void *buf, size_t len)
HX((pid = getsid(pid)) == -1, pid); HX((pid = getsid(pid)) == -1, pid);
HX((pid = getppid()) == -1, pid); HX((pid = getppid()) == -1, pid);
HX((pid = getpgid(0)) == -1, pid); HX((pid = getpgid(0)) == -1, pid);
HX((m = getpriority(0, 0)) == -1, m);
HX((e = getpriority(0, 0)) == -1, e);
if (!faster) { if (!faster) {
ts.tv_sec = 0; ts.tv_sec = 0;
@ -291,9 +292,9 @@ getentropy_fallback(void *buf, size_t len)
HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1, HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1,
sigset); sigset);
HD(main); /* an addr in program */
HD(getentropy); /* an addr in this library */
HD(printf); /* an addr in libc */
HF(main); /* an addr in program */
HF(getentropy); /* an addr in this library */
HF(printf); /* an addr in libc */
p = (char *)&p; p = (char *)&p;
HD(p); /* an addr on stack */ HD(p); /* an addr on stack */
p = (char *)&errno; p = (char *)&errno;
@ -413,7 +414,7 @@ getentropy_fallback(void *buf, size_t len)
} }
SHA512_Final(results, &ctx); 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); i += min(sizeof(results), len - i);
} }
memset(results, 0, sizeof results); memset(results, 0, sizeof results);


+ 10
- 9
src/lib/libcrypto/crypto/getentropy_solaris.c View File

@ -1,4 +1,4 @@
/* $OpenBSD: getentropy_solaris.c,v 1.3 2014/07/12 14:46:31 deraadt Exp $ */
/* $OpenBSD: getentropy_solaris.c,v 1.4 2014/07/12 20:41:47 wouter Exp $ */
/* /*
* Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org> * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org>
@ -60,6 +60,7 @@
#define HR(x, l) (SHA512_Update(&ctx, (char *)(x), (l))) #define HR(x, l) (SHA512_Update(&ctx, (char *)(x), (l)))
#define HD(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (x))) #define HD(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (x)))
#define HF(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (void*)))
int getentropy(void *buf, size_t len); int getentropy(void *buf, size_t len);
@ -194,7 +195,7 @@ start:
} }
for (i = 0; i < len; ) { for (i = 0; i < len; ) {
size_t wanted = len - i; 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 (ret == -1) {
if (errno == EAGAIN || errno == EINTR) if (errno == EAGAIN || errno == EINTR)
@ -243,7 +244,7 @@ static int
getentropy_fallback(void *buf, size_t len) getentropy_fallback(void *buf, size_t len)
{ {
uint8_t results[SHA512_DIGEST_LENGTH]; uint8_t results[SHA512_DIGEST_LENGTH];
int save_errno = errno, e, m, pgs = getpagesize(), faster = 0, repeat;
int save_errno = errno, e, pgs = getpagesize(), faster = 0, repeat;
static int cnt; static int cnt;
struct timespec ts; struct timespec ts;
struct timeval tv; struct timeval tv;
@ -254,7 +255,7 @@ getentropy_fallback(void *buf, size_t len)
SHA512_CTX ctx; SHA512_CTX ctx;
static pid_t lastpid; static pid_t lastpid;
pid_t pid; pid_t pid;
size_t i, ii;
size_t i, ii, m;
char *p; char *p;
pid = getpid(); pid = getpid();
@ -283,7 +284,7 @@ getentropy_fallback(void *buf, size_t len)
HX((pid = getsid(pid)) == -1, pid); HX((pid = getsid(pid)) == -1, pid);
HX((pid = getppid()) == -1, pid); HX((pid = getppid()) == -1, pid);
HX((pid = getpgid(0)) == -1, pid); HX((pid = getpgid(0)) == -1, pid);
HX((m = getpriority(0, 0)) == -1, m);
HX((e = getpriority(0, 0)) == -1, e);
HX((getloadavg(loadavg, 3) == -1), loadavg); HX((getloadavg(loadavg, 3) == -1), loadavg);
if (!faster) { if (!faster) {
@ -296,9 +297,9 @@ getentropy_fallback(void *buf, size_t len)
HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1, HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1,
sigset); sigset);
HD(main); /* an addr in program */
HD(getentropy); /* an addr in this library */
HD(printf); /* an addr in libc */
HF(main); /* an addr in program */
HF(getentropy); /* an addr in this library */
HF(printf); /* an addr in libc */
p = (char *)&p; p = (char *)&p;
HD(p); /* an addr on stack */ HD(p); /* an addr on stack */
p = (char *)&errno; p = (char *)&errno;
@ -416,7 +417,7 @@ getentropy_fallback(void *buf, size_t len)
HD(cnt); HD(cnt);
} }
SHA512_Final(results, &ctx); 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); i += min(sizeof(results), len - i);
} }
memset(results, 0, sizeof results); memset(results, 0, sizeof results);


Write Preview
Loading…
Cancel
Save