Verify parameter retrieval functions.

[openssl.git] / e_os.h

diff --git a/e_os.h b/e_os.h
index c6c6082c83feb2da2499ca3972492af6fdbf7fd4..f737ae854747f8ee26d44a6cba00d50dca3cad58 100644 (file)
--- a/e_os.h
+++ b/e_os.h
@@ -82,7 +82,7 @@ extern "C" {
 #define DEVRANDOM "/dev/urandom","/dev/random","/dev/srandom"
 #endif
 #ifndef DEVRANDOM_EGD
 #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
+/* 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 files
  * listed in DEVRANDOM did not return enough entropy. */
 #define DEVRANDOM_EGD "/var/run/egd-pool","/dev/egd-pool","/etc/egd-pool","/etc/entropy"
  * 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"


@@ -99,7 +99,6 @@ extern "C" {
 #  ifndef MAC_OS_GUSI_SOURCE
 #    define MAC_OS_pre_X
 #    define NO_SYS_TYPES_H
 #  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
 #  endif
 #  define NO_SYS_PARAM_H
 #  define NO_CHMOD


@@ -112,7 +111,7 @@ extern "C" {
 /********************************************************************
  The Microsoft section
  ********************************************************************/
 /********************************************************************
  The Microsoft section
  ********************************************************************/

-/* The following is used becaue of the small stack in some
+/* The following is used because of the small stack in some

  * Microsoft operating systems */
 #if defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYSNAME_WIN32)
 #  define MS_STATIC    static
  * Microsoft operating systems */
 #if defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYSNAME_WIN32)
 #  define MS_STATIC    static


@@ -150,7 +149,6 @@ extern "C" {
 #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 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(__DJGPP__)
 #define WATT32
 #define get_last_socket_error()        errno
 #elif defined(__DJGPP__)
 #define WATT32
 #define get_last_socket_error()        errno


@@ -272,22 +270,25 @@ extern "C" {
        */
 #      define _WIN32_WINNT 0x0400
 #    endif
        */
 #      define _WIN32_WINNT 0x0400
 #    endif

-#    if !defined(OPENSSL_NO_SOCK) && defined(_WIN32_WINNT)
+#    if !defined(OPENSSL_NO_SOCK) && (defined(_WIN32_WINNT) || defined(_WIN32_WCE))

        /*
         * Just like defining _WIN32_WINNT including winsock2.h implies
        /*
         * Just like defining _WIN32_WINNT including winsock2.h implies

-        * certain "discipline" for maintaing [broad] binary compatibility.
+        * certain "discipline" for maintaining [broad] binary compatibility.

         * As long as structures are invariant among Winsock versions,
         * it's sufficient to check for specific Winsock2 API availability
         * at run-time [DSO_global_lookup is recommended]...
         */
 #      include <winsock2.h>
 #      include <ws2tcpip.h>
         * As long as structures are invariant among Winsock versions,
         * it's sufficient to check for specific Winsock2 API availability
         * at run-time [DSO_global_lookup is recommended]...
         */
 #      include <winsock2.h>
 #      include <ws2tcpip.h>

-       /* yes, they have to be #included prior <windows.h> */
+       /* yes, they have to be #included prior to <windows.h> */

 #    endif
 #    include <windows.h>
 #    include <stdio.h>
 #    include <stddef.h>
 #    include <errno.h>
 #    endif
 #    include <windows.h>
 #    include <stdio.h>
 #    include <stddef.h>
 #    include <errno.h>

+#    if defined(_WIN32_WCE) && !defined(EACCES)
+#      define EACCES   13
+#    endif

 #    include <string.h>
 #    ifdef _WIN64
 #      define strlen(s) _strlen31(s)
 #    include <string.h>
 #    ifdef _WIN64
 #      define strlen(s) _strlen31(s)


@@ -308,7 +309,7 @@ static unsigned int _strlen31(const char *str)
 #      undef isupper
 #      undef isxdigit
 #    endif
 #      undef isupper
 #      undef isxdigit
 #    endif

-#    if defined(_MSC_VER) && !defined(_DLL) && defined(stdin)
+#    if defined(_MSC_VER) && !defined(_WIN32_WCE) && !defined(_DLL) && defined(stdin)

 #      if _MSC_VER>=1300
 #        undef stdin
 #        undef stdout
 #      if _MSC_VER>=1300
 #        undef stdin
 #        undef stdout


@@ -334,15 +335,15 @@ static unsigned int _strlen31(const char *str)
 #      endif
 #    endif
 #  endif
 #      endif
 #    endif
 #  endif

-#  include <io.h>
-#  include <fcntl.h>
+#  if !defined(OPENSSL_FIPSCANISTER)
+#    include <io.h>
+#    include <fcntl.h>
+#  endif

 
 #  ifdef OPENSSL_SYS_WINCE
 #    define OPENSSL_NO_POSIX_IO
 #  endif
 
 
 #  ifdef OPENSSL_SYS_WINCE
 #    define OPENSSL_NO_POSIX_IO
 #  endif
 

-#  define ssize_t long
-

 #  if defined (__BORLANDC__)
 #    define _setmode setmode
 #    define _O_TEXT O_TEXT
 #  if defined (__BORLANDC__)
 #    define _setmode setmode
 #    define _O_TEXT O_TEXT


@@ -372,7 +373,7 @@ static unsigned int _strlen31(const char *str)
 #    define DEFAULT_HOME  "C:"
 #  endif
 
 #    define DEFAULT_HOME  "C:"
 #  endif
 

-#else /* The non-microsoft world world */
+#else /* The non-microsoft world */

 
 #  ifdef OPENSSL_SYS_VMS
 #    define VMS 1
 
 #  ifdef OPENSSL_SYS_VMS
 #    define VMS 1


@@ -457,9 +458,6 @@ static unsigned int _strlen31(const char *str)
                          * (unless when compiling with -D_POSIX_SOURCE,
                          * which doesn't work for us) */
 #    endif
                          * (unless when compiling with -D_POSIX_SOURCE,
                          * which doesn't work for us) */
 #    endif

-#    if defined(NeXT) || defined(OPENSSL_SYS_NEWS4) || defined(OPENSSL_SYS_SUNOS)
-#      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;
 #    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;


@@ -624,12 +622,18 @@ static unsigned int _strlen31(const char *str)
 #    define INVALID_SOCKET     (-1)
 #    endif /* INVALID_SOCKET */
 #  endif
 #    define INVALID_SOCKET     (-1)
 #    endif /* INVALID_SOCKET */
 #  endif

-#endif

 
 

-#if defined(__ultrix)
-#  ifndef ssize_t
-#    define ssize_t int 
+/* Some IPv6 implementations are broken, disable them in known bad
+ * versions.
+ */
+#  if !defined(OPENSSL_USE_IPV6)
+#    if defined(AF_INET6) && !defined(OPENSSL_SYS_BEOS_BONE) && !defined(NETWARE_CLIB)
+#      define OPENSSL_USE_IPV6 1
+#    else
+#      define OPENSSL_USE_IPV6 0
+#    endif

 #  endif
 #  endif

+

 #endif
 
 #if defined(sun) && !defined(__svr4__) && !defined(__SVR4)
 #endif
 
 #if defined(sun) && !defined(__svr4__) && !defined(__SVR4)