diff options
| author | Rich Salz <rsalz@openssl.org> | 2014-12-17 17:24:51 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2014-12-17 17:24:51 -0500 |
| commit | b317819b2e74f1f84925695596aa3c7487a2264d (patch) | |
| tree | ea63fdae98feb3e02588d177d2b2d9897a14f473 /crypto/rand | |
| parent | 179f6b2f552adb2740f30634d75edc4448f516b5 (diff) | |
RT3548: Remove some obsolete platforms
This commit removes BEOS.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/rand')
| -rw-r--r-- | crypto/rand/rand_egd.c | 2 | ||||
| -rw-r--r-- | crypto/rand/rand_unix.c | 19 |
2 files changed, 2 insertions, 19 deletions
diff --git a/crypto/rand/rand_egd.c b/crypto/rand/rand_egd.c index 7351f4eade..0a74e40646 100644 --- a/crypto/rand/rand_egd.c +++ b/crypto/rand/rand_egd.c @@ -95,7 +95,7 @@ * RAND_egd() is a wrapper for RAND_egd_bytes() with numbytes=255. */ -#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_NETWARE) || defined(OPENSSL_SYS_VOS) || defined(OPENSSL_SYS_BEOS) +#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_NETWARE) || defined(OPENSSL_SYS_VOS) int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes) { return(-1); diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c index e3a65571c8..04fbc90b75 100644 --- a/crypto/rand/rand_unix.c +++ b/crypto/rand/rand_unix.c @@ -295,12 +295,7 @@ int RAND_poll(void) { int try_read = 0; -#if defined(OPENSSL_SYS_BEOS_R5) - /* select() is broken in BeOS R5, so we simply - * try to read something and snooze if we couldn't */ - try_read = 1; - -#elif defined(OPENSSL_SYS_LINUX) +#if defined(OPENSSL_SYS_LINUX) /* use poll() */ struct pollfd pset; @@ -347,10 +342,6 @@ int RAND_poll(void) r = read(fd,(unsigned char *)tmpbuf+n, ENTROPY_NEEDED-n); if (r > 0) n += r; -#if defined(OPENSSL_SYS_BEOS_R5) - if (r == 0) - snooze(t.tv_usec); -#endif } else r = -1; @@ -404,14 +395,6 @@ int RAND_poll(void) l=time(NULL); RAND_add(&l,sizeof(l),0.0); -#if defined(OPENSSL_SYS_BEOS) - { - system_info sysInfo; - get_system_info(&sysInfo); - RAND_add(&sysInfo,sizeof(sysInfo),0); - } -#endif - #if defined(DEVRANDOM) || defined(DEVRANDOM_EGD) return 1; #else |