X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=e_os.h;h=00edebe6d47c568e12fcc871c9d7356d751df770;hp=d658191987d33901a193e5bda94dfcfd6c31caf2;hb=f309c1ae50a58f9f4521506b0325de415fb773e0;hpb=e02cc10ea4fa7ded67203bfa89628d8fc49c8fab diff --git a/e_os.h b/e_os.h index d658191987..00edebe6d4 100644 --- a/e_os.h +++ b/e_os.h @@ -81,8 +81,20 @@ extern "C" { * My default, we will try to read at least one of these files */ #define DEVRANDOM "/dev/urandom","/dev/random","/dev/srandom" #endif +#ifndef DEVRANDOM_EGD +/* set this to a comma-seperated list of 'egd' sockets to try out. These + * sockets will be tried in the order listed in case accessing the device files + * listed in DEVRANDOM did not return enough entropy. */ +#define DEVRANDOM_EGD "/var/run/egd-pool","/dev/egd-pool","/etc/egd-pool","/etc/entropy" +#endif -#if defined(__MWERKS__) && defined(macintosh) +#if defined(OPENSSL_SYS_VXWORKS) +# define NO_SYS_PARAM_H +# define NO_CHMOD +# define NO_SYSLOG +#endif + +#if defined(OPENSSL_SYS_MACINTOSH_CLASSIC) # if macintosh==1 # ifndef MAC_OS_GUSI_SOURCE # define MAC_OS_pre_X @@ -102,23 +114,23 @@ extern "C" { ********************************************************************/ /* The following is used becaue of the small stack in some * Microsoft operating systems */ -#if defined(WIN16) || defined(MSDOS) +#if defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYSNAME_WIN32) # define MS_STATIC static #else # define MS_STATIC #endif -#if defined(_WIN32) && !defined(WIN32) && !defined(__CYGWIN32__) +#if defined(OPENSSL_SYS_WIN32) && !defined(WIN32) # define WIN32 #endif - -#if (defined(WIN32) || defined(WIN16)) && !defined(__CYGWIN32__) -# ifndef WINDOWS -# define WINDOWS -# endif -# ifndef MSDOS -# define MSDOS -# endif +#if defined(OPENSSL_SYS_WIN16) && !defined(WIN16) +# define WIN16 +#endif +#if defined(OPENSSL_SYS_WINDOWS) && !defined(WINDOWS) +# define WINDOWS +#endif +#if defined(OPENSSL_SYS_MSDOS) && !defined(MSDOS) +# define MSDOS #endif #if defined(MSDOS) && !defined(GETPID_IS_MEANINGLESS) @@ -136,7 +148,7 @@ extern "C" { #define clear_sys_error() errno=0 #endif -#if defined(WINDOWS) && !defined(__CYGWIN32__) +#if defined(WINDOWS) #define get_last_socket_error() WSAGetLastError() #define clear_socket_error() WSASetLastError(0) #define readsocket(s,b,n) recv((s),(b),(n),0) @@ -148,6 +160,13 @@ extern "C" { #define closesocket(s) MacSocket_close(s) #define readsocket(s,b,n) MacSocket_recv((s),(b),(n),true) #define writesocket(s,b,n) MacSocket_send((s),(b),(n)) +#elif defined(OPENSSL_SYS_VMS) +#define get_last_socket_error() errno +#define clear_socket_error() errno=0 +#define ioctlsocket(a,b,c) ioctl(a,b,c) +#define closesocket(s) close(s) +#define readsocket(s,b,n) recv((s),(b),(n),0) +#define writesocket(s,b,n) send((s),(b),(n),0) #else #define get_last_socket_error() errno #define clear_socket_error() errno=0 @@ -158,7 +177,7 @@ extern "C" { #endif #ifdef WIN16 -# define NO_FP_API +# define OPENSSL_NO_FP_API # define MS_CALLBACK _far _loadds # define MS_FAR _far #else @@ -166,11 +185,19 @@ extern "C" { # define MS_FAR #endif -#ifdef NO_STDIO -# define NO_FP_API +#ifdef OPENSSL_NO_STDIO +# define OPENSSL_NO_FP_API #endif -#if (defined(WINDOWS) || defined(MSDOS)) && !defined(__CYGWIN32__) +#if (defined(WINDOWS) || defined(MSDOS)) + +# ifdef __DJGPP__ +# include +# include +# define _setmode setmode +# define _O_TEXT O_TEXT +# define _O_BINARY O_BINARY +# endif /* __DJGPP__ */ # ifndef S_IFDIR # define S_IFDIR _S_IFDIR @@ -224,14 +251,12 @@ extern "C" { # define SSLEAY_CONF OPENSSL_CONF # define NUL_DEV "nul" # define RFILE ".rnd" +# define DEFAULT_HOME "C:" #else /* The non-microsoft world world */ -# if defined(__VMS) && !defined(VMS) -# define VMS 1 -# endif - -# ifdef VMS +# ifdef OPENSSL_SYS_VMS +# define VMS 1 /* some programs don't include stdlib, so exit() and others give implicit function warnings */ # include @@ -277,7 +302,7 @@ extern "C" { # define NO_SYS_PARAM_H # else /* !defined VMS */ -# ifdef MPE +# ifdef OPENSSL_SYS_MPE # define NO_SYS_PARAM_H # endif # ifdef OPENSSL_UNISTD @@ -288,13 +313,13 @@ extern "C" { # ifndef NO_SYS_TYPES_H # include # endif -# if defined(NeXT) || defined(NEWS4) +# if defined(NeXT) || defined(OPENSSL_SYS_NEWS4) # define pid_t int /* pid_t is missing on NEXTSTEP/OPENSTEP * (unless when compiling with -D_POSIX_SOURCE, * which doesn't work for us) */ # define ssize_t int /* ditto */ # endif -# ifdef NEWS4 /* setvbuf is missing on mips-sony-bsd */ +# ifdef OPENSSL_SYS_NEWS4 /* setvbuf is missing on mips-sony-bsd */ # define setvbuf(a, b, c, d) setbuffer((a), (b), (d)) typedef unsigned long clock_t; # endif @@ -319,10 +344,10 @@ extern "C" { /*************/ #ifdef USE_SOCKETS -# if defined(WINDOWS) || defined(MSDOS) +# if (defined(WINDOWS) || defined(MSDOS)) && !defined(__DJGPP__) /* windows world */ -# ifdef NO_SOCK +# ifdef OPENSSL_NO_SOCK # define SSLeay_Write(a,b,c) (-1) # define SSLeay_Read(a,b,c) (-1) # define SHUTDOWN(fd) close(fd) @@ -349,12 +374,14 @@ extern HINSTANCE _hInstance; # ifndef NO_SYS_PARAM_H # include # endif -# ifndef MPE +# ifdef OPENSSL_SYS_VXWORKS +# include +# elif !defined(OPENSSL_SYS_MPE) # include /* Needed under linux for FD_XXX */ # endif # include -# if defined(VMS) && !defined(__DECC) +# if defined(OPENSSL_SYS_VMS_NODECC) # include # include # include @@ -372,7 +399,7 @@ extern HINSTANCE _hInstance; # include # endif -# ifdef AIX +# ifdef OPENSSL_SYS_AIX # include # endif @@ -404,7 +431,9 @@ extern HINSTANCE _hInstance; # define SSLeay_Write(a,b,c) write((a),(b),(c)) # define SHUTDOWN(fd) { shutdown((fd),0); closesocket((fd)); } # define SHUTDOWN2(fd) { shutdown((fd),2); closesocket((fd)); } +# ifndef INVALID_SOCKET # define INVALID_SOCKET (-1) +# endif /* INVALID_SOCKET */ # endif #endif @@ -414,13 +443,10 @@ extern HINSTANCE _hInstance; # endif #endif -#if defined(THREADS) || defined(sun) -#ifndef _REENTRANT -#define _REENTRANT -#endif -#endif - #if defined(sun) && !defined(__svr4__) && !defined(__SVR4) + /* include headers first, so our defines don't break it */ +#include +#include /* bcopy can handle overlapping moves according to SunOS 4.1.4 manpage */ # define memmove(s1,s2,n) bcopy((s2),(s1),(n)) # define strtoul(s,e,b) ((unsigned long int)strtol((s),(e),(b))) @@ -448,10 +474,17 @@ extern char *sys_errlist[]; extern int sys_nerr; #ifdef sgi #define IRIX_CC_BUG /* all version of IRIX I've tested (4.* 5.*) */ #endif -#ifdef SNI +#ifdef OPENSSL_SYS_SNI #define IRIX_CC_BUG /* CDS++ up to V2.0Bsomething suffered from the same bug.*/ #endif +#if defined(OPENSSL_SYS_OS2) && defined(__EMX__) +# include +# include +# define NO_SYSLOG +# define strcasecmp stricmp +#endif + #ifdef __cplusplus } #endif