diff options
| author | Andy Polyakov <appro@openssl.org> | 2016-05-16 16:44:33 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2016-05-19 22:28:49 +0200 |
| commit | 2e6d7799ffc47604d06e0465afeb84b91aff8006 (patch) | |
| tree | d4e036a6b224eb2c7602a789dbdb2b03d0febb0b /crypto/rand | |
| parent | c223c4a9ce9b36b352a55e91862e1c6eda533723 (diff) | |
| download | openssl-new-2e6d7799ffc47604d06e0465afeb84b91aff8006.tar.gz | |
rand/randfile.c: remove _XOPEN_SOURCE definition.
Defintions of macros similar to _XOPEN_SOURCE belong in command line
or in worst case prior first #include directive in source. As for
macros is was allegedly controlling. One can argue that we are
probably better off demanding S_IS* macros but there are systems
that just don't comply, hence this compromise solution...
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/rand')
| -rw-r--r-- | crypto/rand/randfile.c | 34 |
1 files changed, 26 insertions, 8 deletions
diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c index a40b2864f0..43547646c4 100644 --- a/crypto/rand/randfile.c +++ b/crypto/rand/randfile.c @@ -9,11 +9,6 @@ #include "e_os.h" -/* We need to define this to get macros like S_IFBLK and S_IFCHR */ -#if !defined(OPENSSL_SYS_VXWORKS) -# define _XOPEN_SOURCE 500 -#endif - #include <errno.h> #include <stdio.h> #include <stdlib.h> @@ -32,6 +27,29 @@ #ifndef OPENSSL_NO_POSIX_IO # include <sys/stat.h> # include <fcntl.h> +/* + * Following should not be needed, and we could have been stricter + * and demand S_IS*. But some systems just don't comply... Formally + * below macros are "anatomically incorrect", because normally they + * would look like ((m) & MASK == TYPE), but since MASK availability + * is as questionable, we settle for this poor-man fallback... + */ +# if !defined(S_ISBLK) +# if defined(_S_IFBLK) +# define S_ISBLK(m) ((m) & _S_IFBLK) +# elif defined(S_IFBLK) +# define S_ISBLK(m) ((m) & S_IFBLK) +# elif defined(_WIN32) +# define S_ISBLK(m) 0 /* no concept of block devices on Windows */ +# endif +# endif +# if !defined(S_ISCHR) +# if defined(_S_IFCHR) +# define S_ISCHR(m) ((m) & _S_IFCHR) +# elif defined(S_IFCHR) +# define S_ISCHR(m) ((m) & S_IFCHR) +# endif +# endif #endif #ifdef _WIN32 @@ -101,15 +119,15 @@ int RAND_load_file(const char *file, long bytes) #endif if (in == NULL) goto err; -#if defined(S_IFBLK) && defined(S_IFCHR) && !defined(OPENSSL_NO_POSIX_IO) - if (sb.st_mode & (S_IFBLK | S_IFCHR)) { +#if defined(S_ISBLK) && defined(S_ISCHR) && !defined(OPENSSL_NO_POSIX_IO) + if (S_ISBLK(sb.st_mode) || S_ISCHR(sb.st_mode)) { /* * this file is a device. we don't want read an infinite number of * bytes from a random device, nor do we want to use buffered I/O * because we will waste system entropy. */ bytes = (bytes == -1) ? 2048 : bytes; /* ok, is 2048 enough? */ - setbuf(stdin, NULL); /* don't do buffered reads */ + setbuf(in, NULL); /* don't do buffered reads */ } #endif for (;;) { |