[openssl.org #2376] [PATCH] cleanup / fix cryptlib.c for OpenWatcom (1.0.0b)

[Guenter via RT]

Hi,
the patch below against OpenSSL 1.0.0b cleans up alloca() usage in 
cryptlib.c and fixes win32 target compilation with OpenWatcom:
--- cryptlib.c.orig     Sat Apr 10 15:13:12 2010
+++ cryptlib.c  Thu Nov 18 18:11:02 2010
@@ -743,6 +743,16 @@
  #if defined(_WIN32) && !defined(__CYGWIN__)
  #include <tchar.h>
  #include <signal.h>
+#ifdef __WATCOMC__
+#if defined(_UNICODE) || defined(__UNICODE__)
+#define _vsntprintf _vsnwprintf
+#else
+#define _vsntprintf _vsnprintf
+#endif
+#endif
+#ifdef _MSC_VER
+#define alloca _alloca
+#endif

  #if defined(_WIN32_WINNT) && _WIN32_WINNT>=0x0333
  int OPENSSL_isservice(void)
@@ -773,11 +783,7 @@

      if (len>512) return -1;           /* paranoia */
      len++,len&=~1;                    /* paranoia */
-#ifdef _MSC_VER
-    name=(WCHAR *)_alloca(len+sizeof(WCHAR));
-#else
      name=(WCHAR *)alloca(len+sizeof(WCHAR));
-#endif
      if (!GetUserObjectInformationW (h,UOI_NAME,name,len,&len))
        return -1;

@@ -822,11 +828,7 @@
        size_t len_0=strlen(fmta)+1,i;
        WCHAR *fmtw;

-#ifdef _MSC_VER
-       fmtw = (WCHAR *)_alloca (len_0*sizeof(WCHAR));
-#else
-       fmtw = (WCHAR *)alloca (len_0*sizeof(WCHAR));
-#endif
+       fmtw = (WCHAR *)alloca(len_0*sizeof(WCHAR));
        if (fmtw == NULL) { fmt=(const TCHAR *)L"no stack?"; break; }

  #ifndef OPENSSL_NO_MULTIBYTE

patch also attached.





--- cryptlib.c.orig     Sat Apr 10 15:13:12 2010
+++ cryptlib.c  Thu Nov 18 18:11:02 2010
@@ -743,6 +743,16 @@
 #if defined(_WIN32) && !defined(__CYGWIN__)
 #include <tchar.h>
 #include <signal.h>
+#ifdef __WATCOMC__
+#if defined(_UNICODE) || defined(__UNICODE__)
+#define _vsntprintf _vsnwprintf
+#else
+#define _vsntprintf _vsnprintf
+#endif
+#endif
+#ifdef _MSC_VER
+#define alloca _alloca
+#endif
 
 #if defined(_WIN32_WINNT) && _WIN32_WINNT>=0x0333
 int OPENSSL_isservice(void)
@@ -773,11 +783,7 @@
 
     if (len>512) return -1;            /* paranoia */
     len++,len&=~1;                     /* paranoia */
-#ifdef _MSC_VER
-    name=(WCHAR *)_alloca(len+sizeof(WCHAR));
-#else
     name=(WCHAR *)alloca(len+sizeof(WCHAR));
-#endif
     if (!GetUserObjectInformationW (h,UOI_NAME,name,len,&len))
        return -1;
 
@@ -822,11 +828,7 @@
       size_t len_0=strlen(fmta)+1,i;
       WCHAR *fmtw;
 
-#ifdef _MSC_VER
-       fmtw = (WCHAR *)_alloca (len_0*sizeof(WCHAR));
-#else
-       fmtw = (WCHAR *)alloca (len_0*sizeof(WCHAR));
-#endif
+       fmtw = (WCHAR *)alloca(len_0*sizeof(WCHAR));
        if (fmtw == NULL) { fmt=(const TCHAR *)L"no stack?"; break; }
 
 #ifndef OPENSSL_NO_MULTIBYTE