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

winhttp: Store a pointer to the netconn_t in the SSL context.

This commit is contained in:
Juan Lang 2010-05-17 10:29:23 -07:00 committed by Alexandre Julliard
parent 7c7d00a12f
commit 2a569a9e89
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/winhttp/net.c
View File

@ -95,6 +95,7 @@ static SSL_METHOD *method;
static SSL_CTX *ctx; static SSL_CTX *ctx;
static int hostname_idx; static int hostname_idx;
static int error_idx; static int error_idx;
static int conn_idx;
#define MAKE_FUNCPTR(f) static typeof(f) * p##f #define MAKE_FUNCPTR(f) static typeof(f) * p##f
@ -485,6 +486,14 @@ BOOL netconn_init( netconn_t *conn, BOOL secure )
LeaveCriticalSection( &init_ssl_cs ); LeaveCriticalSection( &init_ssl_cs );
return FALSE; return FALSE;
} }
conn_idx = pSSL_get_ex_new_index( 0, (void *)"netconn index", NULL, NULL, NULL );
if (conn_idx == -1)
{
ERR("SSL_get_ex_new_index failed: %s\n", pERR_error_string( pERR_get_error(), 0 ));
set_last_error( ERROR_OUTOFMEMORY );
LeaveCriticalSection( &init_ssl_cs );
return FALSE;
}
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);
@ -631,6 +640,12 @@ BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname )
set_last_error( ERROR_WINHTTP_SECURE_CHANNEL_ERROR ); set_last_error( ERROR_WINHTTP_SECURE_CHANNEL_ERROR );
goto fail; goto fail;
} }
if (!pSSL_set_ex_data( conn->ssl_conn, conn_idx, conn ))
{
ERR("SSL_set_ex_data failed: %s\n", pERR_error_string( pERR_get_error(), 0 ));
set_last_error( ERROR_WINHTTP_SECURE_CHANNEL_ERROR );
return FALSE;
}
if (!pSSL_set_fd( conn->ssl_conn, conn->socket )) if (!pSSL_set_fd( conn->ssl_conn, conn->socket ))
{ {
ERR("SSL_set_fd failed: %s\n", pERR_error_string( pERR_get_error(), 0 )); ERR("SSL_set_fd failed: %s\n", pERR_error_string( pERR_get_error(), 0 ));