jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Comment out dynamic CertEnumCertificatesInStore loading by default

Browse source 
This is now available in MinGW header files, so the loading code is
triggering conflicts.
This commit is contained in:
Jouni Malinen 2008-12-11 00:57:15 +02:00
parent 9e72e1d356
commit 2ff0f83b9e
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/crypto/tls_openssl.c
View file

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