From: Jouni Malinen <j@w1.fi>
Date: Wed, 10 Dec 2008 22:57:15 +0000 (+0200)
Subject: Comment out dynamic CertEnumCertificatesInStore loading by default
X-Git-Tag: hostap_0_6_7~121
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2ff0f83b9e64b49e223ab37fe422d9f1214a304c;p=thirdparty%2Fhostap.git

Comment out dynamic CertEnumCertificatesInStore loading by default

This is now available in MinGW header files, so the loading code is
triggering conflicts.
---

diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c
index c43c40b09..f290a39c7 100644
--- a/src/crypto/tls_openssl.c
+++ b/src/crypto/tls_openssl.c
@@ -120,10 +120,12 @@ static BOOL WINAPI
 				     DWORD *pdwKeySpec, BOOL *pfCallerFreeProv)
 = NULL; /* to be loaded from crypt32.dll */
 
+#ifdef CONFIG_MINGW32_LOAD_CERTENUM
 static PCCERT_CONTEXT WINAPI
 (*CertEnumCertificatesInStore)(HCERTSTORE hCertStore,
 			       PCCERT_CONTEXT pPrevCertContext)
 = NULL; /* to be loaded from crypt32.dll */
+#endif /* CONFIG_MINGW32_LOAD_CERTENUM */
 
 static int mingw_load_crypto_func(void)
 {
@@ -151,6 +153,7 @@ static int mingw_load_crypto_func(void)
 		return -1;
 	}
 
+#ifdef CONFIG_MINGW32_LOAD_CERTENUM
 	CertEnumCertificatesInStore = (void *) GetProcAddress(
 		dll, "CertEnumCertificatesInStore");
 	if (CertEnumCertificatesInStore == NULL) {
@@ -159,6 +162,7 @@ static int mingw_load_crypto_func(void)
 			   "crypt32 library");
 		return -1;
 	}
+#endif /* CONFIG_MINGW32_LOAD_CERTENUM */
 
 	return 0;
 }