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

winhttp: Use sk_ functions rather than accessing an OpenSSL stack type directly.

Browse Source
This commit is contained in:
Juan Lang 2009-12-04 16:41:53 -08:00 committed by Alexandre Julliard
parent 24b437942e
commit a5facc9bda
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/winhttp/net.c
View File

@ -124,6 +124,8 @@ MAKE_FUNCPTR( ERR_get_error );
MAKE_FUNCPTR( ERR_error_string ); MAKE_FUNCPTR( ERR_error_string );
MAKE_FUNCPTR( X509_STORE_CTX_get_ex_data ); MAKE_FUNCPTR( X509_STORE_CTX_get_ex_data );
MAKE_FUNCPTR( i2d_X509 ); MAKE_FUNCPTR( i2d_X509 );
MAKE_FUNCPTR( sk_value );
MAKE_FUNCPTR( sk_num );
#undef MAKE_FUNCPTR #undef MAKE_FUNCPTR
static CRITICAL_SECTION *ssl_locks; static CRITICAL_SECTION *ssl_locks;
@ -339,11 +341,11 @@ static int netconn_secure_verify( int preverify_ok, X509_STORE_CTX *ctx )
PCCERT_CONTEXT endCert = NULL; PCCERT_CONTEXT endCert = NULL;
ret = TRUE; ret = TRUE;
for (i = 0; ret && i < ctx->chain->num; i++) for (i = 0; ret && i < psk_num((struct stack_st *)ctx->chain); i++)
{ {
PCCERT_CONTEXT context; PCCERT_CONTEXT context;
cert = (X509 *)ctx->chain->data[i]; cert = (X509 *)psk_value((struct stack_st *)ctx->chain, i);
if ((context = X509_to_cert_context( cert ))) if ((context = X509_to_cert_context( cert )))
{ {
if (i == 0) if (i == 0)
@ -441,6 +443,8 @@ BOOL netconn_init( netconn_t *conn, BOOL secure )
LOAD_FUNCPTR( ERR_error_string ); LOAD_FUNCPTR( ERR_error_string );
LOAD_FUNCPTR( X509_STORE_CTX_get_ex_data ); LOAD_FUNCPTR( X509_STORE_CTX_get_ex_data );
LOAD_FUNCPTR( i2d_X509 ); LOAD_FUNCPTR( i2d_X509 );
LOAD_FUNCPTR( sk_value );
LOAD_FUNCPTR( sk_num );
#undef LOAD_FUNCPTR #undef LOAD_FUNCPTR
pSSL_library_init(); pSSL_library_init();