X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=e_os.h;h=4456b7e51c0be19b8bdc0efdf2fa3ccb6753c8ce;hb=28a0841bf58e3813b2e07ad22f19484308e2f70a;hp=6aa0f73ed068f5b08b3f23c597cfed0b1327124a;hpb=b13fdc4860b5e1bf615b113950788a138e68ae7f;p=thirdparty%2Fopenssl.git diff --git a/e_os.h b/e_os.h index 6aa0f73ed0..4456b7e51c 100644 --- a/e_os.h +++ b/e_os.h @@ -1,4 +1,3 @@ -/* e_os.h */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -90,7 +89,7 @@ extern "C" { */ # define DEVRANDOM "/dev/urandom","/dev/random","/dev/srandom" # endif -# ifndef DEVRANDOM_EGD +# if !defined(OPENSSL_NO_EGD) && !defined(DEVRANDOM_EGD) /* * set this to a comma-separated list of 'egd' sockets to try out. These * sockets will be tried in the order listed in case accessing the device @@ -221,18 +220,16 @@ extern "C" { /* * Defining _WIN32_WINNT here in e_os.h implies certain "discipline." * Most notably we ought to check for availability of each specific - * routine with GetProcAddress() and/or guard NT-specific calls with - * GetVersion() < 0x80000000. One can argue that in latter "or" case - * we ought to /DELAYLOAD some .DLLs in order to protect ourselves - * against run-time link errors. This doesn't seem to be necessary, - * because it turned out that already Windows 95, first non-NT Win32 - * implementation, is equipped with at least NT 3.51 stubs, dummy - * routines with same name, but which do nothing. Meaning that it's - * apparently sufficient to guard "vanilla" NT calls with GetVersion - * alone, while NT 4.0 and above interfaces ought to be linked with - * GetProcAddress at run-time. + * routine that was introduced after denoted _WIN32_WINNT with + * GetProcAddress(). Normally newer functions are masked with higher + * _WIN32_WINNT in SDK headers. So that if you wish to use them in + * some module, you'd need to override _WIN32_WINNT definition in + * the target module in order to "reach for" prototypes, but replace + * calls to new functions with indirect calls. Alternatively it + * might be possible to achieve the goal by /DELAYLOAD-ing .DLLs + * and check for current OS version instead. */ -# define _WIN32_WINNT 0x0400 +# define _WIN32_WINNT 0x0501 # endif # if !defined(OPENSSL_NO_SOCK) && (defined(_WIN32_WINNT) || defined(_WIN32_WCE)) /* @@ -328,7 +325,6 @@ extern FILE *_imp___iob; # define R_OK 4 # endif # define OPENSSL_CONF "openssl.cnf" -# define SSLEAY_CONF OPENSSL_CONF # define NUL_DEV "nul" # define RFILE ".rnd" # ifdef OPENSSL_SYS_WINCE @@ -361,7 +357,6 @@ extern FILE *_imp___iob; # include # endif # define OPENSSL_CONF "openssl.cnf" -# define SSLEAY_CONF OPENSSL_CONF # define RFILE ".rnd" # define LIST_SEPARATOR_CHAR ',' # define NUL_DEV "NLA0:" @@ -380,16 +375,19 @@ extern FILE *_imp___iob; 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. + the status is tagged as an error, which is what is wanted here. + + Finally, we add the VMS C facility code 0x35a000, because there are some + programs, such as Perl, that will reinterpret the code back to something + POSIXly. 'man perlvms' explains it further. + + NOTE: the perlvms manual wants to turn all codes 2 to 255 into success + codes (status type = 1). I couldn't disagree more. Fortunately, the + status type doesn't seem to bother Perl. -- Richard Levitte */ -# define EXIT(n) do { int __VMS_EXIT = n; \ - if (__VMS_EXIT == 0) \ - __VMS_EXIT = 1; \ - else \ - __VMS_EXIT = (n << 3) | 2; \ - __VMS_EXIT |= 0x10000000; \ - exit(__VMS_EXIT); } while(0) +# define EXIT(n) exit((n) ? (((n) << 3) | 2 | 0x10000000 | 0x35a000) : 1) + # define NO_SYS_PARAM_H # define NO_SYS_UN_H @@ -412,7 +410,6 @@ extern int kbhit(void); # define _O_TEXT O_TEXT # define _O_BINARY O_BINARY # define OPENSSL_CONF "openssl.cnf" -# define SSLEAY_CONF OPENSSL_CONF # define RFILE ".rnd" # define LIST_SEPARATOR_CHAR ';' # define EXIT(n) { if (n) printf("ERROR: %d\n", (int)n); exit(n); } @@ -433,14 +430,13 @@ extern int kbhit(void); # endif # define OPENSSL_CONF "openssl.cnf" -# define SSLEAY_CONF OPENSSL_CONF # define RFILE ".rnd" # define LIST_SEPARATOR_CHAR ':' # define NUL_DEV "/dev/null" # define EXIT(n) exit(n) # endif -# define SSLeay_getpid() getpid() +# define OpenSSL_getpid() getpid() # endif @@ -455,8 +451,8 @@ extern int kbhit(void); /* windows world */ # ifdef OPENSSL_NO_SOCK -# define SSLeay_Write(a,b,c) (-1) -# define SSLeay_Read(a,b,c) (-1) +# define OpenSSL_Write(a,b,c) (-1) +# define OpenSSL_Read(a,b,c) (-1) # define SHUTDOWN(fd) close(fd) # define SHUTDOWN2(fd) close(fd) # elif !defined(__DJGPP__) @@ -484,13 +480,13 @@ struct servent *PASCAL getservbyname(const char *, const char *); # define socket(d,t,p) ((int)socket(d,t,p)) # define accept(s,f,l) ((int)accept(s,f,l)) # endif -# define SSLeay_Write(a,b,c) send((a),(b),(c),0) -# define SSLeay_Read(a,b,c) recv((a),(b),(c),0) +# define OpenSSL_Write(a,b,c) send((a),(b),(c),0) +# define OpenSSL_Read(a,b,c) recv((a),(b),(c),0) # define SHUTDOWN(fd) { shutdown((fd),0); closesocket(fd); } # define SHUTDOWN2(fd) { shutdown((fd),2); closesocket(fd); } # else -# define SSLeay_Write(a,b,c) write_s(a,b,c,0) -# define SSLeay_Read(a,b,c) read_s(a,b,c) +# define OpenSSL_Write(a,b,c) write_s(a,b,c,0) +# define OpenSSL_Read(a,b,c) read_s(a,b,c) # define SHUTDOWN(fd) close_s(fd) # define SHUTDOWN2(fd) close_s(fd) # endif @@ -501,6 +497,7 @@ struct servent *PASCAL getservbyname(const char *, const char *); * configured for BSD */ # if defined(NETWARE_BSDSOCK) +# include # include # include # include @@ -513,8 +510,8 @@ struct servent *PASCAL getservbyname(const char *, const char *); # else # include # endif -# define SSLeay_Write(a,b,c) send((a),(b),(c),0) -# define SSLeay_Read(a,b,c) recv((a),(b),(c),0) +# define OpenSSL_Write(a,b,c) send((a),(b),(c),0) +# define OpenSSL_Read(a,b,c) recv((a),(b),(c),0) # define SHUTDOWN(fd) { shutdown((fd),0); closesocket(fd); } # define SHUTDOWN2(fd) { shutdown((fd),2); closesocket(fd); } @@ -545,10 +542,11 @@ struct servent *PASCAL getservbyname(const char *, const char *); # endif # endif # ifdef FILIO_H -# include /* Added for FIONBIO under unixware */ +# include /* FIONBIO in some SVR4, e.g. unixware, solaris */ # endif # include # include +# include # endif # ifdef OPENSSL_SYS_AIX @@ -559,16 +557,12 @@ struct servent *PASCAL getservbyname(const char *, const char *); # include # endif -# if defined(sun) -# include +# ifndef VMS +# include # else -# ifndef VMS + /* ioctl is only in VMS > 7.0 and when socketshr is not used */ +# if !defined(TCPIP_TYPE_SOCKETSHR) && defined(__VMS_VER) && (__VMS_VER > 70000000) # include -# else - /* ioctl is only in VMS > 7.0 and when socketshr is not used */ -# if !defined(TCPIP_TYPE_SOCKETSHR) && defined(__VMS_VER) && (__VMS_VER > 70000000) -# include -# endif # endif # endif @@ -579,8 +573,8 @@ struct servent *PASCAL getservbyname(const char *, const char *); # endif # endif -# define SSLeay_Read(a,b,c) read((a),(b),(c)) -# define SSLeay_Write(a,b,c) write((a),(b),(c)) +# define OpenSSL_Read(a,b,c) read((a),(b),(c)) +# define OpenSSL_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 @@ -601,22 +595,6 @@ struct servent *PASCAL getservbyname(const char *, const char *); # 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]) - /* Being signed SunOS 4.x memcpy breaks ASN1_OBJECT table lookup */ -# include "internal/o_str.h" -# define memcmp OPENSSL_memcmp -# endif - # ifndef OPENSSL_EXIT # if defined(MONOLITH) && !defined(OPENSSL_C) # define OPENSSL_EXIT(n) return(n) @@ -680,23 +658,6 @@ struct servent *getservbyname(const char *name, const char *proto); # endif /* end vxworks */ -# if !defined(inline) && !defined(__cplusplus) -# if defined(__STDC_VERSION__) && __STDC_VERSION__>=199901L - /* do nothing, inline works */ -# elif defined(__GNUC__) && __GNUC__>=2 -# define inline __inline__ -# elif defined(_MSC_VER) - /* - * Visual Studio: inline is available in C++ only, however - * __inline is available for C, see - * http://msdn.microsoft.com/en-us/library/z8y1yy88.aspx - */ -# define inline __inline -# else -# define inline -# endif -# endif - #define OSSL_NELEM(x) (sizeof(x)/sizeof(x[0])) #ifdef __cplusplus