From: Richard Levitte <levitte@openssl.org>
Date: Thu, 14 Oct 2004 05:48:59 +0000 (+0000)
Subject: Because libraries on Windows lack useful version information, the zlib
X-Git-Tag: BEN_FIPS_TEST_6~42^2~34
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5b0f1f7d1375c31280a68b51d5737f4d95df06bf;p=openssl

Because libraries on Windows lack useful version information, the zlib
guys had to change the name to differentiate with older versions when
a backward incompatibility came up.  Of course, we need to adapt.
This change simply tries to load the library through the newer name
(ZLIB1) first, and if that fails, it tries the good old ZLIB.
---

diff --git a/crypto/comp/c_zlib.c b/crypto/comp/c_zlib.c
index 7553a2d107..64101bd084 100644
--- a/crypto/comp/c_zlib.c
+++ b/crypto/comp/c_zlib.c
@@ -357,7 +357,17 @@ COMP_METHOD *COMP_zlib(void)
 	if (!zlib_loaded)
 		{
 #if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
-		zlib_dso = DSO_load(NULL, "ZLIB", NULL, 0);
+		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