Ken Thomases : secur32: Set session credentials in schan_imp_create_session .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6b5f7df5cb8997c5ac5e59854812a907795bc8ad
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6b5f7df5cb8997c5ac5e59854812a907795bc8ad

Author: Ken Thomases <ken at codeweavers.com>
Date:   Sun Mar 13 18:58:14 2011 -0500

secur32: Set session credentials in schan_imp_create_session.

---

 dlls/secur32/schannel.c |   25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c
index 3db2772..f7e05be 100644
--- a/dlls/secur32/schannel.c
+++ b/dlls/secur32/schannel.c
@@ -113,7 +113,8 @@ static ssize_t schan_push_adapter(gnutls_transport_ptr_t transport,
     return buff_len;
 }
 
-static BOOL schan_imp_create_session(gnutls_session_t *s, BOOL is_server)
+static BOOL schan_imp_create_session(gnutls_session_t *s, BOOL is_server,
+                                     gnutls_certificate_credentials cred)
 {
     int err = pgnutls_init(s, is_server ? GNUTLS_SERVER : GNUTLS_CLIENT);
     if (err != GNUTLS_E_SUCCESS)
@@ -132,6 +133,14 @@ static BOOL schan_imp_create_session(gnutls_session_t *s, BOOL is_server)
         return FALSE;
     }
 
+    err = pgnutls_credentials_set(*s, GNUTLS_CRD_CERTIFICATE, cred);
+    if (err != GNUTLS_E_SUCCESS)
+    {
+        pgnutls_perror(err);
+        pgnutls_deinit(*s);
+        return FALSE;
+    }
+
     pgnutls_transport_set_pull_function(*s, schan_pull_adapter);
     pgnutls_transport_set_push_function(*s, schan_push_adapter);
 
@@ -1010,7 +1019,6 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW(
     struct schan_buffers *out_buffers;
     struct schan_credentials *cred;
     struct schan_transport transport;
-    int err;
     SECURITY_STATUS ret;
 
     TRACE("%p %p %s 0x%08x %d %d %p %d %p %p %p %p\n", phCredential, phContext,
@@ -1045,22 +1053,13 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW(
             return SEC_E_INTERNAL_ERROR;
         }
 
-        if (!schan_imp_create_session(&ctx->session, FALSE))
+        if (!schan_imp_create_session(&ctx->session, FALSE, cred->credentials))
         {
             schan_free_handle(handle, SCHAN_HANDLE_CTX);
             HeapFree(GetProcessHeap(), 0, ctx);
             return SEC_E_INTERNAL_ERROR;
         }
 
-        err = pgnutls_credentials_set(ctx->session, GNUTLS_CRD_CERTIFICATE, cred->credentials);
-        if (err != GNUTLS_E_SUCCESS)
-        {
-            pgnutls_perror(err);
-            schan_imp_dispose_session(ctx->session);
-            schan_free_handle(handle, SCHAN_HANDLE_CTX);
-            HeapFree(GetProcessHeap(), 0, ctx);
-        }
-
         phNewContext->dwLower = handle;
         phNewContext->dwUpper = 0;
     }
@@ -1685,7 +1684,7 @@ void SECUR32_deinitSchannelSP(void)
     if (!libgnutls_handle) return;
 
     /* deinitialized sessions first because a pointer to the credentials
-     * are stored for the session by calling gnutls_credentials_set. */
+     * may be stored for the session. */
     while (i--)
     {
         if (schan_handle_table[i].type == SCHAN_HANDLE_CTX)