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

Fix MinGW build: CertCreateCertificateContext() is now known

Browse source
This commit is contained in:
Jouni Malinen 2009-12-20 18:10:10 +02:00
parent f266d1a162
commit de979ef18c
1 changed files with 3 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/crypto/crypto_cryptoapi.c
View file

@ -1,6 +1,6 @@
/* /*
* WPA Supplicant / Crypto wrapper for Microsoft CryptoAPI * Crypto wrapper for Microsoft CryptoAPI
* Copyright (c) 2005-2006, Jouni Malinen <j@w1.fi> * Copyright (c) 2005-2009, Jouni Malinen <j@w1.fi>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as
@ -39,12 +39,6 @@ L"Microsoft Enhanced RSA and AES Cryptographic Provider (Prototype)"
* define here whatever extra is needed. * define here whatever extra is needed.
*/ */
static PCCERT_CONTEXT WINAPI
(*CertCreateCertificateContext)(DWORD dwCertEncodingType,
const BYTE *pbCertEncoded,
DWORD cbCertEncoded)
= NULL; /* to be loaded from crypt32.dll */
static BOOL WINAPI static BOOL WINAPI
(*CryptImportPublicKeyInfo)(HCRYPTPROV hCryptProv, DWORD dwCertEncodingType, (*CryptImportPublicKeyInfo)(HCRYPTPROV hCryptProv, DWORD dwCertEncodingType,
PCERT_PUBLIC_KEY_INFO pInfo, HCRYPTKEY *phKey) PCERT_PUBLIC_KEY_INFO pInfo, HCRYPTKEY *phKey)
@ -58,7 +52,7 @@ static int mingw_load_crypto_func(void)
/* MinGW does not yet have full CryptoAPI support, so load the needed /* MinGW does not yet have full CryptoAPI support, so load the needed
* function here. */ * function here. */
if (CertCreateCertificateContext) if (CryptImportPublicKeyInfo)
return 0; return 0;
dll = LoadLibrary("crypt32"); dll = LoadLibrary("crypt32");
@ -68,15 +62,6 @@ static int mingw_load_crypto_func(void)
return -1; return -1;
} }
CertCreateCertificateContext = (void *) GetProcAddress(
dll, "CertCreateCertificateContext");
if (CertCreateCertificateContext == NULL) {
wpa_printf(MSG_DEBUG, "CryptoAPI: Could not get "
"CertCreateCertificateContext() address from "
"crypt32 library");
return -1;
}
CryptImportPublicKeyInfo = GetProcAddress( CryptImportPublicKeyInfo = GetProcAddress(
dll, "CryptImportPublicKeyInfo"); dll, "CryptImportPublicKeyInfo");
if (CryptImportPublicKeyInfo == NULL) { if (CryptImportPublicKeyInfo == NULL) {