From de979ef18c1aced0597e342de7dab37c15718090 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sun, 20 Dec 2009 18:10:10 +0200 Subject: [PATCH] Fix MinGW build: CertCreateCertificateContext() is now known --- src/crypto/crypto_cryptoapi.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/src/crypto/crypto_cryptoapi.c b/src/crypto/crypto_cryptoapi.c index 568fe0fcd..d0247ba51 100644 --- a/src/crypto/crypto_cryptoapi.c +++ b/src/crypto/crypto_cryptoapi.c @@ -1,6 +1,6 @@ /* - * WPA Supplicant / Crypto wrapper for Microsoft CryptoAPI - * Copyright (c) 2005-2006, Jouni Malinen + * Crypto wrapper for Microsoft CryptoAPI + * Copyright (c) 2005-2009, Jouni Malinen * * 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 @@ -39,12 +39,6 @@ L"Microsoft Enhanced RSA and AES Cryptographic Provider (Prototype)" * 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 (*CryptImportPublicKeyInfo)(HCRYPTPROV hCryptProv, DWORD dwCertEncodingType, 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 * function here. */ - if (CertCreateCertificateContext) + if (CryptImportPublicKeyInfo) return 0; dll = LoadLibrary("crypt32"); @@ -68,15 +62,6 @@ static int mingw_load_crypto_func(void) 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( dll, "CryptImportPublicKeyInfo"); if (CryptImportPublicKeyInfo == NULL) {