diff options
| author | Geoff Thorpe <geoff@openssl.org> | 2008-11-12 03:58:08 +0000 |
|---|---|---|
| committer | Geoff Thorpe <geoff@openssl.org> | 2008-11-12 03:58:08 +0000 |
| commit | 6343829a391df59e46e513c84b6264ee71ad9518 (patch) | |
| tree | 9823103bf5828e47081ac906203516bdc332f577 /crypto/rand/rand_unix.c | |
| parent | 2401debe83e8df930907a39065ebf9a54354f123 (diff) | |
Revert the size_t modifications from HEAD that had led to more
knock-on work than expected - they've been extracted into a patch
series that can be completed elsewhere, or in a different branch,
before merging back to HEAD.
Diffstat (limited to 'crypto/rand/rand_unix.c')
| -rw-r--r-- | crypto/rand/rand_unix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c index e9cba6479d..e978c4a930 100644 --- a/crypto/rand/rand_unix.c +++ b/crypto/rand/rand_unix.c @@ -157,7 +157,7 @@ int RAND_poll(void) pid_t curr_pid = getpid(); #if defined(DEVRANDOM) || defined(DEVRANDOM_EGD) unsigned char tmpbuf[ENTROPY_NEEDED]; - size_t n = 0; + int n = 0; #endif #ifdef DEVRANDOM static const char *randomfiles[] = { DEVRANDOM }; @@ -261,7 +261,7 @@ int RAND_poll(void) if (try_read) { - r = read(fd,tmpbuf+n,ENTROPY_NEEDED-n); + r = read(fd,(unsigned char *)tmpbuf+n, ENTROPY_NEEDED-n); if (r > 0) n += r; #if defined(OPENSSL_SYS_BEOS_R5) |