resolve conflicts

1 files changed, 16 insertions, 72 deletions

diff --git a/src/lib/libcrypto/comp/c_zlib.c b/src/lib/libcrypto/comp/c_zlib.c
index 1bd2850d15..5fcb521ffb 100644
--- a/src/lib/libcrypto/comp/c_zlib.c
+++ b/src/lib/libcrypto/comp/c_zlib.c
@@ -51,30 +51,17 @@ static COMP_METHOD zlib_method={
  */
 #if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
 # include <windows.h>
-
-# define Z_CALLCONV _stdcall
-# define ZLIB_SHARED
-#else
-# define Z_CALLCONV
 #endif /* !(OPENSSL_SYS_WINDOWS || OPENSSL_SYS_WIN32) */
 
 #ifdef ZLIB_SHARED
 #include <openssl/dso.h>
 
-/* Prototypes for built in stubs */
-static int stub_compress(Bytef *dest,uLongf *destLen,
-        const Bytef *source, uLong sourceLen);
-static int stub_inflateEnd(z_streamp strm);
-static int stub_inflate(z_streamp strm, int flush);
-static int stub_inflateInit_(z_streamp strm, const char * version,
-        int stream_size);
-
 /* Function pointers */
-typedef int (Z_CALLCONV *compress_ft)(Bytef *dest,uLongf *destLen,
+typedef int (*compress_ft)(Bytef *dest,uLongf *destLen,
         const Bytef *source, uLong sourceLen);
-typedef int (Z_CALLCONV *inflateEnd_ft)(z_streamp strm);
-typedef int (Z_CALLCONV *inflate_ft)(z_streamp strm, int flush);
-typedef int (Z_CALLCONV *inflateInit__ft)(z_streamp strm,
+typedef int (*inflateEnd_ft)(z_streamp strm);
+typedef int (*inflate_ft)(z_streamp strm, int flush);
+typedef int (*inflateInit__ft)(z_streamp strm,
         const char * version, int stream_size);
 static compress_ft      p_compress=NULL;
 static inflateEnd_ft    p_inflateEnd=NULL;
@@ -84,10 +71,10 @@ static inflateInit__ft	p_inflateInit_=NULL;
 static int zlib_loaded = 0;     /* only attempt to init func pts once */
 static DSO *zlib_dso = NULL;
 
-#define compress                stub_compress
-#define inflateEnd              stub_inflateEnd
-#define inflate                 stub_inflate
-#define inflateInit_            stub_inflateInit_
+#define compress                p_compress
+#define inflateEnd              p_inflateEnd
+#define inflate                 p_inflate
+#define inflateInit_            p_inflateInit_
 #endif /* ZLIB_SHARED */
 
 static int zlib_compress_block(COMP_CTX *ctx, unsigned char *out,
@@ -191,16 +178,6 @@ COMP_METHOD *COMP_zlib(void)
                 {
 #if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
                 zlib_dso = DSO_load(NULL, "ZLIB1", NULL, 0);
-                if (!zlib_dso)
-                        {
-                        zlib_dso = DSO_load(NULL, "ZLIB", NULL, 0);
-                        if (zlib_dso)
-                                {
-                                /* Clear the errors from the first failed
-                                   DSO_load() */
-                                ERR_clear_error();
-                                }
-                        }
 #else
                 zlib_dso = DSO_load(NULL, "z", NULL, 0);
 #endif
@@ -218,54 +195,21 @@ COMP_METHOD *COMP_zlib(void)
                         p_inflateInit_
                                 = (inflateInit__ft) DSO_bind_func(zlib_dso,
                                         "inflateInit_");
-                        zlib_loaded++;
+
+                        if (p_compress && p_inflateEnd && p_inflate
+                                && p_inflateInit_)
+                                zlib_loaded++;
                         }
                 }
 
 #endif
+#ifdef ZLIB_SHARED
+        if (zlib_loaded)
+#endif
 #if defined(ZLIB) || defined(ZLIB_SHARED)
-        meth = &zlib_method;
+                meth = &zlib_method;
 #endif
 
         return(meth);
         }
 
-#ifdef ZLIB_SHARED
-/* Stubs for each function to be dynamicly loaded */
-static int 
-stub_compress(Bytef *dest,uLongf *destLen,const Bytef *source, uLong sourceLen)
-        {
-        if (p_compress)
-                return(p_compress(dest,destLen,source,sourceLen));
-        else
-                return(Z_MEM_ERROR);
-        }
-
-static int
-stub_inflateEnd(z_streamp strm)
-        {
-        if ( p_inflateEnd )
-                return(p_inflateEnd(strm));
-        else
-                return(Z_MEM_ERROR);
-        }
-
-static int
-stub_inflate(z_streamp strm, int flush)
-        {
-        if ( p_inflate )
-                return(p_inflate(strm,flush));
-        else
-                return(Z_MEM_ERROR);
-        }
-
-static int
-stub_inflateInit_(z_streamp strm, const char * version, int stream_size)
-        {
-        if ( p_inflateInit_ )
-                return(p_inflateInit_(strm,version,stream_size));
-        else
-                return(Z_MEM_ERROR);
-        }
-
-#endif /* ZLIB_SHARED */