Module: wine Branch: stable Commit: 8fc929d3330b01d30d09a32321c32c142a1890a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fc929d3330b01d30d09a32321...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Oct 20 21:40:21 2010 +0200
wininet: Load X509_STORE_CTX_get_ex_data from libcrypto not libssl. (cherry picked from commit 0cc9c52f8c5ad5e1f821177f165fbb72be90d2d9)
---
dlls/wininet/netconnection.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index ba0f12a..f7de478 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -146,7 +146,6 @@ MAKE_FUNCPTR(SSL_CTX_get_timeout); MAKE_FUNCPTR(SSL_CTX_set_timeout); MAKE_FUNCPTR(SSL_CTX_set_default_verify_paths); MAKE_FUNCPTR(SSL_CTX_set_verify); -MAKE_FUNCPTR(X509_STORE_CTX_get_ex_data);
/* OpenSSL's libcrypto functions that we use */ MAKE_FUNCPTR(BIO_new_fp); @@ -156,6 +155,7 @@ MAKE_FUNCPTR(CRYPTO_set_locking_callback); MAKE_FUNCPTR(ERR_free_strings); MAKE_FUNCPTR(ERR_get_error); MAKE_FUNCPTR(ERR_error_string); +MAKE_FUNCPTR(X509_STORE_CTX_get_ex_data); MAKE_FUNCPTR(i2d_X509); MAKE_FUNCPTR(sk_num); MAKE_FUNCPTR(sk_value); @@ -427,7 +427,6 @@ DWORD NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) DYNSSL(SSL_CTX_set_timeout); DYNSSL(SSL_CTX_set_default_verify_paths); DYNSSL(SSL_CTX_set_verify); - DYNSSL(X509_STORE_CTX_get_ex_data); #undef DYNSSL
#define DYNCRYPTO(x) \ @@ -445,6 +444,7 @@ DWORD NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) DYNCRYPTO(ERR_free_strings); DYNCRYPTO(ERR_get_error); DYNCRYPTO(ERR_error_string); + DYNCRYPTO(X509_STORE_CTX_get_ex_data); DYNCRYPTO(i2d_X509); DYNCRYPTO(sk_num); DYNCRYPTO(sk_value);