X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=e_os.h;h=3674db552fdf23e3137ce38ad54eee5aae5e70fb;hp=b8d053bda573aa083d2926948c50dc87ce1aa774;hb=bb8aab02113d683b76e06da31b7804591e2e62e0;hpb=4b55c2a3a9590fd27f865e2325195a2e14215bce diff --git a/e_os.h b/e_os.h index b8d053bda5..3674db552f 100644 --- a/e_os.h +++ b/e_os.h @@ -59,6 +59,8 @@ #ifndef HEADER_E_OS_H #define HEADER_E_OS_H +#include + #include /* contains what we can justify to make visible * to the outside; this file e_os.h is not part of the exported @@ -75,9 +77,30 @@ extern "C" { #endif #ifndef DEVRANDOM -/* set this to your 'random' device if you have one. - * My default, we will try to read this file */ -#define DEVRANDOM "/dev/urandom" +/* set this to a comma-separated list of 'random' device files to try out. + * 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(OPENSSL_SYS_MACINTOSH_CLASSIC) +# if macintosh==1 +# ifndef MAC_OS_GUSI_SOURCE +# define MAC_OS_pre_X +# define NO_SYS_TYPES_H + typedef long ssize_t; +# endif +# define NO_SYS_PARAM_H +# define NO_CHMOD +# define NO_SYSLOG +# undef DEVRANDOM +# define GETPID_IS_MEANINGLESS +# endif #endif /******************************************************************** @@ -85,19 +108,27 @@ 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) # define MS_STATIC static #else # define MS_STATIC #endif -#if defined(WIN32) || defined(WIN16) -# ifndef WINDOWS -# define WINDOWS -# endif -# ifndef MSDOS -# define MSDOS -# endif +#if defined(OPENSSL_SYS_WIN32) && !defined(WIN32) +# define WIN32 +#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) +# define GETPID_IS_MEANINGLESS #endif #ifdef WIN32 @@ -111,12 +142,18 @@ extern "C" { #define clear_sys_error() errno=0 #endif -#ifdef WINDOWS +#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) #define writesocket(s,b,n) send((s),(b),(n),0) #define EADDRINUSE WSAEADDRINUSE +#elif defined(MAC_OS_pre_X) +#define get_last_socket_error() errno +#define clear_socket_error() errno=0 +#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)) #else #define get_last_socket_error() errno #define clear_socket_error() errno=0 @@ -127,7 +164,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 @@ -135,25 +172,24 @@ 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) - -#ifndef S_IFDIR -#define S_IFDIR _S_IFDIR -#endif +#if (defined(WINDOWS) || defined(MSDOS)) -#ifndef S_IFMT -#define S_IFMT _S_IFMT +# ifndef S_IFDIR +# define S_IFDIR _S_IFDIR +# endif -#if !defined(WINNT) -#define NO_SYSLOG -#endif -#define NO_DIRENT +# ifndef S_IFMT +# define S_IFMT _S_IFMT +# endif -#endif +# if !defined(WINNT) +# define NO_SYSLOG +# endif +# define NO_DIRENT # ifdef WINDOWS # include @@ -165,40 +201,41 @@ extern "C" { # include # include -#if defined (__BORLANDC__) -#define _setmode setmode -#define _O_TEXT O_TEXT -#define _O_BINARY O_BINARY -#define _int64 __int64 -#endif +# define ssize_t long -#if defined(WIN16) && !defined(MONOLITH) && defined(SSLEAY) && defined(_WINEXITNOPERSIST) -# define EXIT(n) { if (n == 0) _wsetexit(_WINEXITNOPERSIST); return(n); } -#else -# define EXIT(n) return(n); -#endif +# if defined (__BORLANDC__) +# define _setmode setmode +# define _O_TEXT O_TEXT +# define _O_BINARY O_BINARY +# define _int64 __int64 +# define _kbhit kbhit +# endif + +# if defined(WIN16) && !defined(MONOLITH) && defined(SSLEAY) && defined(_WINEXITNOPERSIST) +# define EXIT(n) { if (n == 0) _wsetexit(_WINEXITNOPERSIST); return(n); } +# else +# define EXIT(n) return(n); +# endif # define LIST_SEPARATOR_CHAR ';' -#ifndef X_OK -# define X_OK 0 -#endif -#ifndef W_OK -# define W_OK 2 -#endif -#ifndef R_OK -# define R_OK 4 -#endif +# ifndef X_OK +# define X_OK 0 +# endif +# ifndef W_OK +# define W_OK 2 +# endif +# ifndef R_OK +# define R_OK 4 +# endif # define OPENSSL_CONF "openssl.cnf" # 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 @@ -212,21 +249,59 @@ extern "C" { # define RFILE ".rnd" # define LIST_SEPARATOR_CHAR ',' # define NUL_DEV "NLA0:" - /* We need to do this, because DEC C converts exit code 0 to 1, but not 1 - to 0. We will convert 1 to 3! Also, add the inhibit message bit... */ -# ifndef MONOLITH + /* We don't have any well-defined random devices on VMS, yet... */ +# undef DEVRANDOM + /* We need to do this since VMS has the following coding on status codes: + + Bits 0-2: status type: 0 = warning, 1 = success, 2 = error, 3 = info ... + The important thing to know is that odd numbers are considered + good, while even ones are considered errors. + Bits 3-15: actual status number + Bits 16-27: facility number. 0 is considered "unknown" + Bits 28-31: control bits. If bit 28 is set, the shell won't try to + output the message (which, for random codes, just looks ugly) + + So, what we do here is to change 0 to 1 to get the default success status, + and everything else is shifted up to fit into the status number field, and + the status is tagged as an error, which I believe is what is wanted here. + -- Richard Levitte + */ +# if !defined(MONOLITH) || defined(OPENSSL_C) # define EXIT(n) do { int __VMS_EXIT = n; \ - if (__VMS_EXIT == 1) __VMS_EXIT = 3; \ + if (__VMS_EXIT == 0) \ + __VMS_EXIT = 1; \ + else \ + __VMS_EXIT = (n << 3) | 2; \ __VMS_EXIT |= 0x10000000; \ - exit(n); return(n); } while(0) + exit(__VMS_EXIT); \ + return(__VMS_EXIT); } while(0) # else -# define EXIT(n) do { int __VMS_EXIT = n; \ - if (__VMS_EXIT == 1) __VMS_EXIT = 3; \ - __VMS_EXIT |= 0x10000000; \ - return(n); } while(0) +# define EXIT(n) return(n) # endif +# define NO_SYS_PARAM_H # else -# include + /* !defined VMS */ +# ifdef OPENSSL_SYS_MPE +# define NO_SYS_PARAM_H +# endif +# ifdef OPENSSL_UNISTD +# include OPENSSL_UNISTD +# else +# include +# endif +# ifndef NO_SYS_TYPES_H +# include +# endif +# 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 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 # define OPENSSL_CONF "openssl.cnf" # define SSLEAY_CONF OPENSSL_CONF @@ -251,7 +326,7 @@ extern "C" { # if defined(WINDOWS) || defined(MSDOS) /* 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) @@ -265,25 +340,35 @@ extern HINSTANCE _hInstance; # define SHUTDOWN2(fd) { shutdown((fd),2); closesocket(fd); } # endif +# elif defined(MAC_OS_pre_X) + +# include "MacSocket.h" +# define SSLeay_Write(a,b,c) MacSocket_send((a),(b),(c)) +# define SSLeay_Read(a,b,c) MacSocket_recv((a),(b),(c),true) +# define SHUTDOWN(fd) MacSocket_close(fd) +# define SHUTDOWN2(fd) MacSocket_close(fd) # else -# include -# ifndef VMS +# ifndef NO_SYS_PARAM_H # include # endif -# include /* Needed under linux for FD_XXX */ +# ifndef 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 # else # include # ifdef FILIO_H # include /* Added for FIONBIO under unixware */ # endif # include +# include # endif # if defined(NeXT) || defined(_NEXT_SOURCE) @@ -291,7 +376,11 @@ extern HINSTANCE _hInstance; # include # endif -# ifdef AIX +# ifdef OPENSSL_SYS_AIX +# include +# endif + +# ifdef __QNX__ # include # endif @@ -317,18 +406,36 @@ extern HINSTANCE _hInstance; # define SSLeay_Read(a,b,c) read((a),(b),(c)) # define SSLeay_Write(a,b,c) write((a),(b),(c)) -# define SHUTDOWN(fd) { shutdown((fd),0); close((fd)); } -# define SHUTDOWN2(fd) { shutdown((fd),2); close((fd)); } +# define SHUTDOWN(fd) { shutdown((fd),0); closesocket((fd)); } +# define SHUTDOWN2(fd) { shutdown((fd),2); closesocket((fd)); } # define INVALID_SOCKET (-1) # endif #endif -#if defined(THREADS) || defined(sun) +#if defined(__ultrix) +# ifndef ssize_t +# define ssize_t int +# endif +#endif + +#if defined(OPENSSL_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))) +extern char *sys_errlist[]; extern int sys_nerr; +# define strerror(errnum) \ + (((errnum)<0 || (errnum)>=sys_nerr) ? NULL : sys_errlist[errnum]) +#endif + /***********************************************/ /* do we need to do this for getenv. @@ -348,21 +455,15 @@ extern HINSTANCE _hInstance; #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 -#ifdef NO_MD2 -#define MD2_Init MD2Init -#define MD2_Update MD2Update -#define MD2_Final MD2Final -#define MD2_DIGEST_LENGTH 16 -#endif -#ifdef NO_MD5 -#define MD5_Init MD5Init -#define MD5_Update MD5Update -#define MD5_Final MD5Final -#define MD5_DIGEST_LENGTH 16 +#if defined(OPENSSL_SYS_OS2) && defined(__EMX__) +# include +# include +# define NO_SYSLOG +# define strcasecmp stricmp #endif #ifdef __cplusplus