Upgrade chrome's OpenSSL to same version Android ships with.

openssl/e_os.h

 /* e_os.h */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
  * 
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
@@ skipping 94 matching lines @@
 #  define NO_CHMOD
 #  define NO_SYSLOG
 #  undef  DEVRANDOM
 #  define GETPID_IS_MEANINGLESS
 # endif
 #endif
 
 /********************************************************************
  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
 #else
 #  define MS_STATIC
 #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
@@ skipping 34 matching lines @@
 #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)
 #elif defined(OPENSSL_SYS_VXWORKS)
 #define get_last_socket_error() errno
 #define clear_socket_error()    errno=0
 #define ioctlsocket(a,b,c)          ioctl((a),(b),(int)(c))
 #define closesocket(s)              close(s)
 #define readsocket(s,b,n)           read((s),(b),(n))
 #define writesocket(s,b,n)          write((s),(char *)(b),(n))
+#elif defined(OPENSSL_SYS_BEOS_R5)
+#define get_last_socket_error() errno
+#define clear_socket_error()    errno=0
+#define FIONBIO SO_NONBLOCK
+#define ioctlsocket(a,b,c)                setsockopt((a),SOL_SOCKET,(b),(c),sizeof(*(c)))
+#define readsocket(s,b,n)       recv((s),(b),(n),0)
+#define writesocket(s,b,n)      send((s),(b),(n),0)
 #elif defined(OPENSSL_SYS_NETWARE)
 #if defined(NETWARE_BSDSOCK)
 #define get_last_socket_error() errno
 #define clear_socket_error()    errno=0
 #define closesocket(s)          close(s)
 #define ioctlsocket(a,b,c)      ioctl(a,b,c)
 #if defined(NETWARE_LIBC)
 #define readsocket(s,b,n)       recv((s),(b),(n),0)
 #define writesocket(s,b,n)      send((s),(b),(n),0)
 #else
 #define readsocket(s,b,n)       recv((s),(char*)(b),(n),0)
 #define writesocket(s,b,n)      send((s),(char*)(b),(n),0)
 #endif
 #else
 #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)
 #endif
 #else
 #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)       read((s),(b),(n))
 #define writesocket(s,b,n)      write((s),(b),(n))
 #endif
 
-#ifdef WIN16
+#ifdef WIN16 /* never the case */
 #  define MS_CALLBACK   _far _loadds
 #  define MS_FAR        _far
 #else
 #  define MS_CALLBACK
 #  define MS_FAR
 #endif
 
 #ifdef OPENSSL_NO_STDIO
 #  undef OPENSSL_NO_FP_API
 #  define OPENSSL_NO_FP_API
@@ skipping 25 matching lines @@
 #  if !defined(WINNT) && !defined(__DJGPP__)
 #    define NO_SYSLOG
 #  endif
 #  define NO_DIRENT
 
 #  ifdef WINDOWS
 #    if !defined(_WIN32_WCE) && !defined(_WIN32_WINNT)
        /*
         * 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 quard NT-specific calls with
+        * 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 appropriate to guard generic NT calls with GetVersion
-        * alone, while NT 4.0 and above calls ought to be additionally
-        * checked upon with GetProcAddress.
+        * 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.
         */
 #      define _WIN32_WINNT 0x0400
 #    endif
+#    if !defined(OPENSSL_NO_SOCK) && defined(_WIN32_WINNT)
+       /*
+        * Just like defining _WIN32_WINNT including winsock2.h implies
+        * 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>
+       /* yes, they have to be #included prior to <windows.h> */
+#    endif
 #    include <windows.h>
 #    include <stdio.h>
 #    include <stddef.h>
 #    include <errno.h>
 #    include <string.h>
 #    ifdef _WIN64
 #      define strlen(s) _strlen31(s)
 /* cut strings to 2GB */
 static unsigned int _strlen31(const char *str)
         {
@@ skipping 20 matching lines @@
 #        define stdin  (&__iob_func()[0])
 #        define stdout (&__iob_func()[1])
 #        define stderr (&__iob_func()[2])
 #      elif defined(I_CAN_LIVE_WITH_LNK4049)
 #        undef stdin
 #        undef stdout
 #        undef stderr
          /* pre-1300 has __p__iob(), but it's available only in msvcrt.lib,
           * or in other words with /MD. Declaring implicit import, i.e.
           * with _imp_ prefix, works correctly with all compiler options,
-          * but without /MD results in LINK warning LNK4049:
-          * 'locally defined symbol "__iob" imported'.
+          * but without /MD results in LINK warning LNK4049:
+          * 'locally defined symbol "__iob" imported'.
           */
          extern FILE *_imp___iob;
 #        define stdin  (&_imp___iob[0])
 #        define stdout (&_imp___iob[1])
 #        define stderr (&_imp___iob[2])
 #      endif
 #    endif
 #  endif
 #  include <io.h>
 #  include <fcntl.h>
 
 #  ifdef OPENSSL_SYS_WINCE
-#    include <winsock_extras.h>
+#    define OPENSSL_NO_POSIX_IO
 #  endif
 
 #  define ssize_t long
 
 #  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(SSLEAY) && defined(_WINEXITNOPERSIST)
-#    define EXIT(n) _wsetexit(_WINEXITNOPERSIST)
-#    define OPENSSL_EXIT(n) do { if (n == 0) EXIT(n); return(n); } while(0)
-#  else
-#    define EXIT(n) exit(n)
-#  endif
+#  define EXIT(n) exit(n)
 #  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
 #  define OPENSSL_CONF  "openssl.cnf"
 #  define SSLEAY_CONF   OPENSSL_CONF
 #  define NUL_DEV       "nul"
 #  define RFILE         ".rnd"
 #  ifdef OPENSSL_SYS_WINCE
 #    define DEFAULT_HOME  ""
 #  else
 #    define DEFAULT_HOME  "C:"
 #  endif
 
-#else /* The non-microsoft world world */
+#else /* The non-microsoft world */
 
 #  ifdef OPENSSL_SYS_VMS
 #    define VMS 1
   /* some programs don't include stdlib, so exit() and others give implicit 
      function warnings */
 #    include <stdlib.h>
 #    if defined(__DECC)
 #      include <unistd.h>
 #    else
 #      include <unixlib.h>
@@ skipping 32 matching lines @@
 #  elif defined(OPENSSL_SYS_NETWARE)
 #    include <fcntl.h>
 #    include <unistd.h>
 #    define NO_SYS_TYPES_H
 #    undef  DEVRANDOM
 #    ifdef NETWARE_CLIB
 #      define getpid GetThreadID
        extern int GetThreadID(void);
 /* #      include <conio.h> */
        extern int kbhit(void);
-       extern void delay(unsigned milliseconds);
 #    else
 #      include <screen.h>
 #    endif
 #    define NO_SYSLOG
 #    define _setmode setmode
 #    define _kbhit kbhit
 #    define _O_TEXT O_TEXT
 #    define _O_BINARY O_BINARY
 #    define OPENSSL_CONF   "openssl.cnf"
 #    define SSLEAY_CONF    OPENSSL_CONF
@@ skipping 19 matching lines @@
                          * (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;
 #    endif
+#    ifdef OPENSSL_SYS_WIN32_CYGWIN
+#      include <io.h>
+#      include <fcntl.h>
+#    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()
 
 #endif
 
 
 /*************/
 
 #ifdef USE_SOCKETS
 #  if defined(WINDOWS) || defined(MSDOS)
       /* windows world */
 
 #    ifdef OPENSSL_NO_SOCK
 #      define SSLeay_Write(a,b,c)       (-1)
 #      define SSLeay_Read(a,b,c)        (-1)
 #      define SHUTDOWN(fd)              close(fd)
 #      define SHUTDOWN2(fd)             close(fd)
 #    elif !defined(__DJGPP__)
-#      include <winsock.h>
-extern HINSTANCE _hInstance;
+#      if defined(_WIN32_WCE) && _WIN32_WCE<410
+#        define getservbyname _masked_declaration_getservbyname
+#      endif
+#      if !defined(IPPROTO_IP)
+         /* winsock[2].h was included already? */
+#        include <winsock.h>
+#      endif
+#      ifdef getservbyname
+#        undef getservbyname
+         /* this is used to be wcecompat/include/winsock_extras.h */
+         struct servent* PASCAL getservbyname(const char*,const char*);
+#      endif
+
 #      ifdef _WIN64
 /*
  * Even though sizeof(SOCKET) is 8, it's safe to cast it to int, because
  * the value constitutes an index in per-process table of limited size
  * and not a real pointer.
  */
 #        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)
@@ skipping 51 matching lines @@
 #    if defined(OPENSSL_SYS_VMS_NODECC)
 #      include <socket.h>
 #      include <in.h>
 #      include <inet.h>
 #    else
 #      include <sys/socket.h>
 #      ifdef FILIO_H
 #        include <sys/filio.h> /* Added for FIONBIO under unixware */
 #      endif
 #      include <netinet/in.h>
+#      if !defined(OPENSSL_SYS_BEOS_R5)
 #      include <arpa/inet.h>
 #    endif
+#    endif
 
 #    if defined(NeXT) || defined(_NEXT_SOURCE)
 #      include <sys/fcntl.h>
 #      include <sys/types.h>
 #    endif
 
 #    ifdef OPENSSL_SYS_AIX
 #      include <sys/select.h>
 #    endif
 
@@ skipping 22 matching lines @@
 #    endif
 
 #    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); closesocket((fd)); }
 #    define SHUTDOWN2(fd)   { shutdown((fd),2); closesocket((fd)); }
 #    ifndef INVALID_SOCKET
 #    define INVALID_SOCKET      (-1)
 #    endif /* INVALID_SOCKET */
 #  endif
+
+/* 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
 
 #if defined(__ultrix)
 #  ifndef ssize_t
 #    define ssize_t int 
 #  endif
 #endif
 
 #if defined(sun) && !defined(__svr4__) && !defined(__SVR4)
   /* include headers first, so our defines don't break it */
@@ skipping 13 matching lines @@
 #ifndef OPENSSL_EXIT
 # if defined(MONOLITH) && !defined(OPENSSL_C)
 #  define OPENSSL_EXIT(n) return(n)
 # else
 #  define OPENSSL_EXIT(n) do { EXIT(n); return(n); } while(0)
 # endif
 #endif
 
 /***********************************************/
 
-/* do we need to do this for getenv.
- * Just define getenv for use under windows */
-
-#ifdef WIN16
-/* How to do this needs to be thought out a bit more.... */
-/*char *GETENV(char *);
-#define Getenv  GETENV*/
-#define Getenv  getenv
-#else
-#define Getenv getenv
-#endif
-
 #define DG_GCC_BUG      /* gcc < 2.6.3 on DGUX */
 
 #ifdef sgi
 #define IRIX_CC_BUG     /* all version of IRIX I've tested (4.* 5.*) */
 #endif
 #ifdef OPENSSL_SYS_SNI
 #define IRIX_CC_BUG     /* CDS++ up to V2.0Bsomething suffered from the same bug.*/
 #endif
 
 #if defined(OPENSSL_SYS_WINDOWS)
@@ skipping 41 matching lines @@
 /* NOTE: these are implemented by helpers in database app!
  * if the database is not linked, we need to implement them
  * elswhere */
 struct hostent *gethostbyname(const char *name);
 struct hostent *gethostbyaddr(const char *addr, int length, int type);
 struct servent *getservbyname(const char *name, const char *proto);
 
 #endif
 /* end vxworks */
 
+/* beos */
+#if defined(OPENSSL_SYS_BEOS_R5)
+#define SO_ERROR 0
+#define NO_SYS_UN
+#define IPPROTO_IP 0
+#include <OS.h>
+#endif
+
+
 #ifdef  __cplusplus
 }
 #endif
 
 #endif