diff options
| author | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2009-05-30 19:53:49 +0000 |
|---|---|---|
| committer | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2009-05-30 19:53:49 +0000 |
| commit | 6aa7fb8de2a73e7910f9742546ee13bc148a6fe1 (patch) | |
| tree | f156472f6a7f7930e287339c9c10a952cc8a8241 /cryptoapi.c | |
| parent | 775a6ac2796a55bad3489d8532fd138d232fd2c4 (diff) | |
| download | openvpn-6aa7fb8de2a73e7910f9742546ee13bc148a6fe1.tar.gz openvpn-6aa7fb8de2a73e7910f9742546ee13bc148a6fe1.tar.xz openvpn-6aa7fb8de2a73e7910f9742546ee13bc148a6fe1.zip | |
Fixed issue of symbol conflicts interfering with Windows CryptoAPI
functionality (Alon Bar-Lev).
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@4475 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to 'cryptoapi.c')
| -rw-r--r-- | cryptoapi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cryptoapi.c b/cryptoapi.c index e100469..0e6b64c 100644 --- a/cryptoapi.c +++ b/cryptoapi.c @@ -75,7 +75,7 @@ static ERR_STRING_DATA CRYPTOAPI_str_functs[] = { { ERR_PACK(ERR_LIB_CRYPTOAPI, 0, 0), "microsoft cryptoapi"}, { ERR_PACK(0, CRYPTOAPI_F_CERT_OPEN_SYSTEM_STORE, 0), "CertOpenSystemStore" }, { ERR_PACK(0, CRYPTOAPI_F_CERT_FIND_CERTIFICATE_IN_STORE, 0), "CertFindCertificateInStore" }, - { ERR_PACK(0, CRYPTOAPI_F_CRYPT_ACQUIRE_CERTIFICATE_PRIVATE_KEY, 0), "OpenVPNCryptAcquireCertificatePrivateKey" }, + { ERR_PACK(0, CRYPTOAPI_F_CRYPT_ACQUIRE_CERTIFICATE_PRIVATE_KEY, 0), "CryptAcquireCertificatePrivateKey" }, { ERR_PACK(0, CRYPTOAPI_F_CRYPT_CREATE_HASH, 0), "CryptCreateHash" }, { ERR_PACK(0, CRYPTOAPI_F_CRYPT_GET_HASH_PARAM, 0), "CryptGetHashParam" }, { ERR_PACK(0, CRYPTOAPI_F_CRYPT_SET_HASH_PARAM, 0), "CryptSetHashParam" }, @@ -389,7 +389,7 @@ int SSL_CTX_use_CryptoAPI_certificate(SSL_CTX *ssl_ctx, const char *cert_prop) } if (OpenVPNCryptAcquireCertificatePrivateKey == NULL) { OpenVPNCryptAcquireCertificatePrivateKey = GetProcAddress(crypt32dll, - "OpenVPNCryptAcquireCertificatePrivateKey"); + "CryptAcquireCertificatePrivateKey"); if (OpenVPNCryptAcquireCertificatePrivateKey == NULL) { CRYPTOAPIerr(CRYPTOAPI_F_GET_PROC_ADDRESS); goto err; |