ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wininet: Set error and fail if a secure connection's certificate couldn't be verified.

This commit is contained in:
Juan Lang 2009-12-14 16:02:33 -08:00 committed by Alexandre Julliard
parent bd5c5953f3
commit 09246aa1a7
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dlls/wininet/netconnection.c
View File

@ -116,6 +116,7 @@ static void *OpenSSL_crypto_handle;
static SSL_METHOD *meth; static SSL_METHOD *meth;
static SSL_CTX *ctx; static SSL_CTX *ctx;
static int hostname_idx; static int hostname_idx;
static int error_idx;
#define MAKE_FUNCPTR(f) static typeof(f) * p##f #define MAKE_FUNCPTR(f) static typeof(f) * p##f
@ -321,7 +322,7 @@ static int netconn_secure_verify(int preverify_ok, X509_STORE_CTX *ctx)
if (err) if (err)
{ {
INTERNET_SetLastError(err); pSSL_set_ex_data(ssl, error_idx, (void *)err);
ret = FALSE; ret = FALSE;
} }
} }
@ -445,6 +446,15 @@ DWORD NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL)
LeaveCriticalSection(&init_ssl_cs); LeaveCriticalSection(&init_ssl_cs);
return ERROR_OUTOFMEMORY; return ERROR_OUTOFMEMORY;
} }
error_idx = pSSL_get_ex_new_index(0, (void *)"error index",
NULL, NULL, NULL);
if (error_idx == -1)
{
ERR("SSL_get_ex_new_index failed; %s\n",
pERR_error_string(pERR_get_error(), 0));
LeaveCriticalSection(&init_ssl_cs);
return ERROR_OUTOFMEMORY;
}
pSSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, netconn_secure_verify); pSSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, netconn_secure_verify);
pCRYPTO_set_id_callback(ssl_thread_id); pCRYPTO_set_id_callback(ssl_thread_id);
@ -650,9 +660,10 @@ DWORD NETCON_secure_connect(WININET_NETCONNECTION *connection, LPWSTR hostname)
if (pSSL_connect(connection->ssl_s) <= 0) if (pSSL_connect(connection->ssl_s) <= 0)
{ {
ERR("SSL_connect failed: %s\n", res = (DWORD)pSSL_get_ex_data(connection->ssl_s, error_idx);
pERR_error_string(pERR_get_error(), 0)); if (!res)
res = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; res = ERROR_INTERNET_SECURITY_CHANNEL_ERROR;
ERR("SSL_connect failed: %d\n", res);
goto fail; goto fail;
} }
pSSL_set_ex_data(connection->ssl_s, hostname_idx, hostname); pSSL_set_ex_data(connection->ssl_s, hostname_idx, hostname);