7 files changed, 83 insertions, 21 deletions

diff --git a/src/lib/libcrypto/bio/b_sock.c b/src/lib/libcrypto/bio/b_sock.c
index 12b0a53a81..d47310d650 100644
--- a/src/lib/libcrypto/bio/b_sock.c
+++ b/src/lib/libcrypto/bio/b_sock.c
@@ -551,7 +551,30 @@ int BIO_socket_ioctl(int fd, long type, void *arg)
 #ifdef __DJGPP__
         i=ioctlsocket(fd,type,(char *)arg);
 #else
-        i=ioctlsocket(fd,type,arg);
+# if defined(OPENSSL_SYS_VMS)
+        /* 2011-02-18 SMS.
+         * VMS ioctl() can't tolerate a 64-bit "void *arg", but we
+         * observe that all the consumers pass in an "unsigned long *",
+         * so we arrange a local copy with a short pointer, and use
+         * that, instead.
+         */
+#  if __INITIAL_POINTER_SIZE == 64
+#   define ARG arg_32p
+#   pragma pointer_size save
+#   pragma pointer_size 32
+        unsigned long arg_32;
+        unsigned long *arg_32p;
+#   pragma pointer_size restore
+        arg_32p = &arg_32;
+        arg_32 = *((unsigned long *) arg);
+#  else /* __INITIAL_POINTER_SIZE == 64 */
+#   define ARG arg
+#  endif /* __INITIAL_POINTER_SIZE == 64 [else] */
+# else /* defined(OPENSSL_SYS_VMS) */
+#  define ARG arg
+# endif /* defined(OPENSSL_SYS_VMS) [else] */
+
+        i=ioctlsocket(fd,type,ARG);
 #endif /* __DJGPP__ */
         if (i < 0)
                 SYSerr(SYS_F_IOCTLSOCKET,get_last_socket_error());
@@ -660,6 +683,7 @@ int BIO_get_accept_socket(char *host, int bind_mode)
          * note that commonly IPv6 wildchard socket can service
          * IPv4 connections just as well...  */
         memset(&hint,0,sizeof(hint));
+        hint.ai_flags = AI_PASSIVE;
         if (h)
                 {
                 if (strchr(h,':'))
@@ -672,7 +696,10 @@ int BIO_get_accept_socket(char *host, int bind_mode)
 #endif
                         }
                 else if (h[0]=='*' && h[1]=='\0')
+                        {
+                        hint.ai_family = AF_INET;
                         h=NULL;
+                        }
                 }
 
         if ((*p_getaddrinfo.f)(h,p,&hint,&res)) break;
diff --git a/src/lib/libcrypto/bio/bf_nbio.c b/src/lib/libcrypto/bio/bf_nbio.c
index c72a23c2e1..028616c064 100644
--- a/src/lib/libcrypto/bio/bf_nbio.c
+++ b/src/lib/libcrypto/bio/bf_nbio.c
@@ -125,7 +125,6 @@ static int nbiof_free(BIO *a)
         
 static int nbiof_read(BIO *b, char *out, int outl)
         {
-        NBIO_TEST *nt;
         int ret=0;
 #if 1
         int num;
@@ -134,7 +133,6 @@ static int nbiof_read(BIO *b, char *out, int outl)
 
         if (out == NULL) return(0);
         if (b->next_bio == NULL) return(0);
-        nt=(NBIO_TEST *)b->ptr;
 
         BIO_clear_retry_flags(b);
 #if 1
diff --git a/src/lib/libcrypto/bio/bio_lib.c b/src/lib/libcrypto/bio/bio_lib.c
index 77f4de9c32..e12bc3a2ca 100644
--- a/src/lib/libcrypto/bio/bio_lib.c
+++ b/src/lib/libcrypto/bio/bio_lib.c
@@ -110,7 +110,7 @@ int BIO_set(BIO *bio, BIO_METHOD *method)
 
 int BIO_free(BIO *a)
         {
-        int ret=0,i;
+        int i;
 
         if (a == NULL) return(0);
 
@@ -133,7 +133,7 @@ int BIO_free(BIO *a)
         CRYPTO_free_ex_data(CRYPTO_EX_INDEX_BIO, a, &a->ex_data);
 
         if ((a->method == NULL) || (a->method->destroy == NULL)) return(1);
-        ret=a->method->destroy(a);
+        a->method->destroy(a);
         OPENSSL_free(a);
         return(1);
         }
diff --git a/src/lib/libcrypto/bio/bss_acpt.c b/src/lib/libcrypto/bio/bss_acpt.c
index 826f761143..5d49e1a72b 100644
--- a/src/lib/libcrypto/bio/bss_acpt.c
+++ b/src/lib/libcrypto/bio/bss_acpt.c
@@ -340,7 +340,6 @@ static int acpt_write(BIO *b, const char *in, int inl)
 
 static long acpt_ctrl(BIO *b, int cmd, long num, void *ptr)
         {
-        BIO *dbio;
         int *ip;
         long ret=1;
         BIO_ACCEPT *data;
@@ -437,8 +436,8 @@ static long acpt_ctrl(BIO *b, int cmd, long num, void *ptr)
                 ret=(long)data->bind_mode;
                 break;
         case BIO_CTRL_DUP:
-                dbio=(BIO *)ptr;
-/*              if (data->param_port) EAY EAY
+/*              dbio=(BIO *)ptr;
+                if (data->param_port) EAY EAY
                         BIO_set_port(dbio,data->param_port);
                 if (data->param_hostname)
                         BIO_set_hostname(dbio,data->param_hostname);
diff --git a/src/lib/libcrypto/bio/bss_dgram.c b/src/lib/libcrypto/bio/bss_dgram.c
index eb7e365467..71ebe987b6 100644
--- a/src/lib/libcrypto/bio/bss_dgram.c
+++ b/src/lib/libcrypto/bio/bss_dgram.c
@@ -57,7 +57,6 @@
  *
  */
 
-#ifndef OPENSSL_NO_DGRAM
 
 #include <stdio.h>
 #include <errno.h>
@@ -65,6 +64,7 @@
 #include "cryptlib.h"
 
 #include <openssl/bio.h>
+#ifndef OPENSSL_NO_DGRAM
 
 #if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS)
 #include <sys/timeb.h>
@@ -308,7 +308,6 @@ static int dgram_read(BIO *b, char *out, int outl)
                         OPENSSL_assert(sa.len.s<=sizeof(sa.peer));
                         sa.len.i = (int)sa.len.s;
                         }
-                dgram_reset_rcv_timeout(b);
 
                 if ( ! data->connected  && ret >= 0)
                         BIO_ctrl(b, BIO_CTRL_DGRAM_SET_PEER, 0, &sa.peer);
@@ -322,6 +321,8 @@ static int dgram_read(BIO *b, char *out, int outl)
                                 data->_errno = get_last_socket_error();
                                 }
                         }
+
+                dgram_reset_rcv_timeout(b);
                 }
         return(ret);
         }
@@ -340,7 +341,7 @@ static int dgram_write(BIO *b, const char *in, int inl)
 
                 if (data->peer.sa.sa_family == AF_INET)
                         peerlen = sizeof(data->peer.sa_in);
-#if OPENSSL_USE_IVP6
+#if OPENSSL_USE_IPV6
                 else if (data->peer.sa.sa_family == AF_INET6)
                         peerlen = sizeof(data->peer.sa_in6);
 #endif
@@ -745,9 +746,13 @@ static int BIO_dgram_should_retry(int i)
                 {
                 err=get_last_socket_error();
 
-#if defined(OPENSSL_SYS_WINDOWS) && 0 /* more microsoft stupidity? perhaps not? Ben 4/1/99 */
-                if ((i == -1) && (err == 0))
-                        return(1);
+#if defined(OPENSSL_SYS_WINDOWS)
+        /* If the socket return value (i) is -1
+         * and err is unexpectedly 0 at this point,
+         * the error code was overwritten by
+         * another system call before this error
+         * handling is called.
+         */
 #endif
 
                 return(BIO_dgram_non_fatal_error(err));
@@ -810,7 +815,6 @@ int BIO_dgram_non_fatal_error(int err)
                 }
         return(0);
         }
-#endif
 
 static void get_current_time(struct timeval *t)
         {
@@ -828,3 +832,5 @@ static void get_current_time(struct timeval *t)
         gettimeofday(t, NULL);
 #endif
         }
+
+#endif
diff --git a/src/lib/libcrypto/bio/bss_file.c b/src/lib/libcrypto/bio/bss_file.c
index 8bfa0bcd97..b954fe7ebc 100644
--- a/src/lib/libcrypto/bio/bss_file.c
+++ b/src/lib/libcrypto/bio/bss_file.c
@@ -123,6 +123,7 @@ BIO *BIO_new_file(const char *filename, const char *mode)
 
 #if defined(_WIN32) && defined(CP_UTF8)
         int sz, len_0 = (int)strlen(filename)+1;
+        DWORD flags;
 
         /*
          * Basically there are three cases to cover: a) filename is
@@ -136,17 +137,22 @@ BIO *BIO_new_file(const char *filename, const char *mode)
          * ERROR_NO_UNICODE_TRANSLATION, in which case we fall
          * back to fopen...
          */
-        if ((sz=MultiByteToWideChar(CP_UTF8,MB_ERR_INVALID_CHARS,
+        if ((sz=MultiByteToWideChar(CP_UTF8,(flags=MB_ERR_INVALID_CHARS),
+                                        filename,len_0,NULL,0))>0 ||
+            (GetLastError()==ERROR_INVALID_FLAGS &&
+             (sz=MultiByteToWideChar(CP_UTF8,(flags=0),
                                         filename,len_0,NULL,0))>0)
+           )
                 {
                 WCHAR  wmode[8];
                 WCHAR *wfilename = _alloca(sz*sizeof(WCHAR));
 
-                if (MultiByteToWideChar(CP_UTF8,MB_ERR_INVALID_CHARS,
+                if (MultiByteToWideChar(CP_UTF8,flags,
                                         filename,len_0,wfilename,sz) &&
                     MultiByteToWideChar(CP_UTF8,0,mode,strlen(mode)+1,
                                         wmode,sizeof(wmode)/sizeof(wmode[0])) &&
-                    (file=_wfopen(wfilename,wmode))==NULL && errno==ENOENT
+                    (file=_wfopen(wfilename,wmode))==NULL &&
+                    (errno==ENOENT || errno==EBADF)
                    )    /* UTF-8 decode succeeded, but no file, filename
                          * could still have been locale-ized... */
                         file = fopen(filename,mode);
diff --git a/src/lib/libcrypto/bio/bss_log.c b/src/lib/libcrypto/bio/bss_log.c
index 7ead044b37..b7dce5c1a2 100644
--- a/src/lib/libcrypto/bio/bss_log.c
+++ b/src/lib/libcrypto/bio/bss_log.c
@@ -75,6 +75,15 @@
 #  include <descrip.h>
 #  include <lib$routines.h>
 #  include <starlet.h>
+/* Some compiler options may mask the declaration of "_malloc32". */
+#  if __INITIAL_POINTER_SIZE && defined _ANSI_C_SOURCE
+#    if __INITIAL_POINTER_SIZE == 64
+#      pragma pointer_size save
+#      pragma pointer_size 32
+    void * _malloc32  (__size_t);
+#      pragma pointer_size restore
+#    endif /* __INITIAL_POINTER_SIZE == 64 */
+#  endif /* __INITIAL_POINTER_SIZE && defined _ANSI_C_SOURCE */
 #elif defined(__ultrix)
 #  include <sys/syslog.h>
 #elif defined(OPENSSL_SYS_NETWARE)
@@ -300,7 +309,24 @@ static void xopenlog(BIO* bp, char* name, int level)
 static void xsyslog(BIO *bp, int priority, const char *string)
 {
         struct dsc$descriptor_s opc_dsc;
+
+/* Arrange 32-bit pointer to opcdef buffer and malloc(), if needed. */
+#if __INITIAL_POINTER_SIZE == 64
+# pragma pointer_size save
+# pragma pointer_size 32
+# define OPCDEF_TYPE __char_ptr32
+# define OPCDEF_MALLOC _malloc32
+#else /* __INITIAL_POINTER_SIZE == 64 */
+# define OPCDEF_TYPE char *
+# define OPCDEF_MALLOC OPENSSL_malloc
+#endif /* __INITIAL_POINTER_SIZE == 64 [else] */
+
         struct opcdef *opcdef_p;
+
+#if __INITIAL_POINTER_SIZE == 64
+# pragma pointer_size restore
+#endif /* __INITIAL_POINTER_SIZE == 64 */
+
         char buf[10240];
         unsigned int len;
         struct dsc$descriptor_s buf_dsc;
@@ -326,8 +352,8 @@ static void xsyslog(BIO *bp, int priority, const char *string)
 
         lib$sys_fao(&fao_cmd, &len, &buf_dsc, priority_tag, string);
 
-        /* we know there's an 8 byte header.  That's documented */
-        opcdef_p = (struct opcdef *) OPENSSL_malloc(8 + len);
+        /* We know there's an 8-byte header.  That's documented. */
+        opcdef_p = OPCDEF_MALLOC( 8+ len);
         opcdef_p->opc$b_ms_type = OPC$_RQ_RQST;
         memcpy(opcdef_p->opc$z_ms_target_classes, &VMS_OPC_target, 3);
         opcdef_p->opc$l_ms_rqstid = 0;
@@ -335,7 +361,7 @@ static void xsyslog(BIO *bp, int priority, const char *string)
 
         opc_dsc.dsc$b_dtype = DSC$K_DTYPE_T;
         opc_dsc.dsc$b_class = DSC$K_CLASS_S;
-        opc_dsc.dsc$a_pointer = (char *)opcdef_p;
+        opc_dsc.dsc$a_pointer = (OPCDEF_TYPE) opcdef_p;
         opc_dsc.dsc$w_length = len + 8;
 
         sys$sndopr(opc_dsc, 0);