[pkg-wine-party] [SCM] Debian Wine packaging branch, master, updated. wine-1.1.33-2-709-g594d443

[Ove Kåven]

The following commit has been merged in the master branch:
commit 600b22c621358aeac08d03a7fae1f295384768b8
Author: Juan Lang <juan.lang at gmail.com>
Date:   Fri Dec 4 16:41:53 2009 -0800

    winhttp: Use sk_ functions rather than accessing an OpenSSL stack type directly.
    (cherry picked from commit a5facc9bdab28987560e70463aa9706eb9735fac)

diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c
index 3ed3b1b..4a3cc90 100644
--- a/dlls/winhttp/net.c
+++ b/dlls/winhttp/net.c
@@ -124,6 +124,8 @@ MAKE_FUNCPTR( CRYPTO_set_locking_callback );
 MAKE_FUNCPTR( ERR_get_error );
 MAKE_FUNCPTR( ERR_error_string );
 MAKE_FUNCPTR( i2d_X509 );
+MAKE_FUNCPTR( sk_value );
+MAKE_FUNCPTR( sk_num );
 #undef MAKE_FUNCPTR
 
 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;
 
             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;
 
-                cert = (X509 *)ctx->chain->data[i];
+                cert = (X509 *)psk_value((struct stack_st *)ctx->chain, i);
                 if ((context = X509_to_cert_context( cert )))
                 {
                     if (i == 0)
@@ -441,6 +443,8 @@ BOOL netconn_init( netconn_t *conn, BOOL secure )
     LOAD_FUNCPTR( ERR_get_error );
     LOAD_FUNCPTR( ERR_error_string );
     LOAD_FUNCPTR( i2d_X509 );
+    LOAD_FUNCPTR( sk_value );
+    LOAD_FUNCPTR( sk_num );
 #undef LOAD_FUNCPTR
 
     pSSL_library_init();

-- 
Debian Wine packaging