Include "!eNULL" in SSL_DEFAULT_CIPHER_LIST to make sure that a

[openssl.git] / e_os.h

diff --git a/e_os.h b/e_os.h
index 3ff9f3cd1c4ce2f2816d6d0789b3860846d49043..e2b656106641d013a5649b8343be1e30e66b0d0e 100644 (file)
--- a/e_os.h
+++ b/e_os.h
@@ -181,11 +181,6 @@ extern "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_NETWARE)
-#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)
 #else
 #define get_last_socket_error()        errno
 #define clear_socket_error()   errno=0
@@ -196,6 +191,7 @@ extern "C" {
 #endif
 
 #ifdef WIN16
+#  define OPENSSL_NO_FP_API
 #  define MS_CALLBACK  _far _loadds
 #  define MS_FAR       _far
 #else
@@ -204,7 +200,6 @@ extern "C" {
 #endif
 
 #ifdef OPENSSL_NO_STDIO
-#  undef OPENSSL_NO_FP_API
 #  define OPENSSL_NO_FP_API
 #endif
 
@@ -219,6 +214,8 @@ extern "C" {
 #    define _setmode setmode
 #    define _O_TEXT O_TEXT
 #    define _O_BINARY O_BINARY
+#    undef DEVRANDOM
+#    define DEVRANDOM "/dev/urandom\x24"
 #  endif /* __DJGPP__ */
 
 #  ifndef S_IFDIR
@@ -326,26 +323,6 @@ extern "C" {
                                      __VMS_EXIT |= 0x10000000; \
                                     exit(__VMS_EXIT); } while(0)
 #    define NO_SYS_PARAM_H
-
-#  elif defined(OPENSSL_SYS_NETWARE)
-#    include <fcntl.h>
-#    include <unistd.h>
-#    define NO_SYS_TYPES_H
-#    undef  DEVRANDOM
-#    ifdef NETWARE_CLIB
-#      define getpid GetThreadID
-#    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
-#    define RFILE    ".rnd"
-#    define LIST_SEPARATOR_CHAR ';'
-#    define EXIT(n)  { if (n) printf("ERROR: %d\n", (int)n); exit(n); }
-
 #  else
      /* !defined VMS */
 #    ifdef OPENSSL_SYS_MPE
@@ -418,19 +395,6 @@ extern HINSTANCE _hInstance;
 #    define SHUTDOWN(fd)               MacSocket_close(fd)
 #    define SHUTDOWN2(fd)              MacSocket_close(fd)
 
-#  elif defined(OPENSSL_SYS_NETWARE)
-         /* NetWare uses the WinSock2 interfaces
-         */
-#      if defined(NETWARE_CLIB)
-#        include <ws2nlm.h>
-#      elif defined(NETWARE_LIBC)
-#        include <novsock2.h>
-#      endif
-#      define SSLeay_Write(a,b,c)   send((a),(b),(c),0)
-#      define SSLeay_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
 
 #    ifndef NO_SYS_PARAM_H
@@ -560,9 +524,6 @@ extern char *sys_errlist[]; extern int sys_nerr;
 #elif defined(OPENSSL_SYS_OS2) && defined(__EMX__)
 #  define strcasecmp stricmp
 #  define strncasecmp strnicmp
-#elif defined(OPENSSL_SYS_NETWARE) && defined(NETWARE_CLIB)
-#  define strcasecmp stricmp
-#  define strncasecmp strnicmp
 #else
 #  ifdef NO_STRINGS_H
     int        strcasecmp();