projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove extra `the` in SSL_SESSION_set1_id.pod
[openssl.git]
/
e_os.h
diff --git
a/e_os.h
b/e_os.h
index 14089f5655441cf757ce328406562bca64f062ea..f3b8fb830de5668df70e124b9395b4df48f338a3 100644
(file)
--- a/
e_os.h
+++ b/
e_os.h
@@
-10,6
+10,7
@@
#ifndef HEADER_E_OS_H
# define HEADER_E_OS_H
#ifndef HEADER_E_OS_H
# define HEADER_E_OS_H
+# include <limits.h>
# include <openssl/opensslconf.h>
# include <openssl/e_os2.h>
# include <openssl/opensslconf.h>
# include <openssl/e_os2.h>
@@
-52,14
+53,16
@@
extern "C" {
* stand for in ILP32 and LP64 */
# endif
* stand for in ILP32 and LP64 */
# endif
-# define OPENSSL_CONF "openssl.cnf"
-
# ifndef DEVRANDOM
/*
* set this to a comma-separated list of 'random' device files to try out. By
* default, we will try to read at least one of these files
*/
# ifndef DEVRANDOM
/*
* set this to a comma-separated list of 'random' device files to try out. By
* default, we will try to read at least one of these files
*/
-# define DEVRANDOM "/dev/urandom","/dev/random","/dev/srandom"
+# if defined(__s390__)
+# define DEVRANDOM "/dev/prandom","/dev/urandom","/dev/hwrng","/dev/random"
+# else
+# define DEVRANDOM "/dev/urandom","/dev/random","/dev/srandom"
+# endif
# endif
# if !defined(OPENSSL_NO_EGD) && !defined(DEVRANDOM_EGD)
/*
# endif
# if !defined(OPENSSL_NO_EGD) && !defined(DEVRANDOM_EGD)
/*
@@
-235,6
+238,12
@@
extern FILE *_imp___iob;
# else /* The non-microsoft world */
# else /* The non-microsoft world */
+# if defined(OPENSSL_SYS_VXWORKS)
+# include <sys/times.h>
+# else
+# include <sys/time.h>
+# endif
+
# ifdef OPENSSL_SYS_VMS
# define VMS 1
/*
# ifdef OPENSSL_SYS_VMS
# define VMS 1
/*