X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=e_os.h;h=4c39cb02380fbb1832b072f218de920188a40795;hp=f480f6223e2c4c94ce1d3304229e623d75beb8ed;hb=2933ed4df719a2b9d8af60e7a770d802b8afd8b2;hpb=fa470a84a026208d07167f90cfa83834140305ae diff --git a/e_os.h b/e_os.h index f480f6223e..4c39cb0238 100644 --- a/e_os.h +++ b/e_os.h @@ -59,10 +59,12 @@ #ifndef HEADER_E_OS_H #define HEADER_E_OS_H +#include + #include /* contains what we can justify to make visible - * to the outside. e_os.h shouldn't even be in the include/openssl - * directory, these are just local definitions. */ + * to the outside; this file e_os.h is not part of the exported + * interface. */ #ifdef __cplusplus extern "C" { @@ -80,6 +82,21 @@ extern "C" { #define DEVRANDOM "/dev/urandom" #endif +#if defined(__MWERKS__) && defined(macintosh) +# 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 + /******************************************************************** The Microsoft section ********************************************************************/ @@ -91,6 +108,10 @@ extern "C" { # define MS_STATIC #endif +#if defined(_WIN32) && !defined(WIN32) +# define WIN32 +#endif + #if defined(WIN32) || defined(WIN16) # ifndef WINDOWS # define WINDOWS @@ -100,12 +121,13 @@ extern "C" { # endif #endif +#if defined(MSDOS) && !defined(GETPID_IS_MEANINGLESS) +# define GETPID_IS_MEANINGLESS +#endif + #ifdef WIN32 #define get_last_sys_error() GetLastError() #define clear_sys_error() SetLastError(0) -/* These are defined in wincrypt.h and can cause problems */ -#undef X509_NAME -#undef PKCS7_SIGNER_INFO #if !defined(WINNT) #define WIN_CONSOLE_BUG #endif @@ -120,6 +142,12 @@ extern "C" { #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 @@ -144,19 +172,18 @@ extern "C" { #if defined(WINDOWS) || defined(MSDOS) -#ifndef S_IFDIR -#define S_IFDIR _S_IFDIR -#endif - -#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 @@ -168,28 +195,31 @@ 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" @@ -215,21 +245,50 @@ 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 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_UNISTD +# include OPENSSL_UNISTD +# else +# include +# endif +# ifndef NO_SYS_TYPES_H +# include +# endif +# ifdef NeXT +# 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 # define OPENSSL_CONF "openssl.cnf" # define SSLEAY_CONF OPENSSL_CONF @@ -268,11 +327,17 @@ 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 */ @@ -320,18 +385,29 @@ 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(__ultrix) +# ifndef ssize_t +# define ssize_t int +# endif +#endif + #if defined(THREADS) || defined(sun) #ifndef _REENTRANT #define _REENTRANT #endif #endif +#if defined(sun) && !defined(__svr4__) +#define memmove(s1,s2,b) bcopy((s2),(s1),(n)) +#define strtoul(s,e,b) ((unsigned long int)strtol((s),(e),(b))) +#endif + /***********************************************/ /* do we need to do this for getenv. @@ -351,6 +427,9 @@ extern HINSTANCE _hInstance; #ifdef sgi #define IRIX_CC_BUG /* all version of IRIX I've tested (4.* 5.*) */ #endif +#ifdef SNI +#define IRIX_CC_BUG /* CDS++ up to V2.0Bsomething suffered from the same bug.*/ +#endif #ifdef NO_MD2 #define MD2_Init MD2Init