Nikolay Sivov : secur32: Add explicit output parameter for create_session() request.
Alexandre Julliard
julliard at winehq.org
Fri May 27 16:35:30 CDT 2022
Module: wine
Branch: master
Commit: 2c44e881522cfea795b635448dffa129e9453e30
URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c44e881522cfea795b635448dffa129e9453e30
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Fri May 27 10:35:45 2022 +0300
secur32: Add explicit output parameter for create_session() request.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/secur32/schannel.c | 1 +
dlls/secur32/schannel_gnutls.c | 23 +++++++++++++----------
dlls/secur32/secur32_priv.h | 1 +
3 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c
index 5d6e8763095..0973b3c2399 100644
--- a/dlls/secur32/schannel.c
+++ b/dlls/secur32/schannel.c
@@ -821,6 +821,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW(
create_params.transport = &ctx->transport;
create_params.cred = cred;
+ create_params.session = &ctx->transport.session;
if (GNUTLS_CALL( create_session, &create_params ))
{
schan_free_handle(handle, SCHAN_HANDLE_CTX);
diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c
index 131b40a45d3..2e462b409d8 100644
--- a/dlls/secur32/schannel_gnutls.c
+++ b/dlls/secur32/schannel_gnutls.c
@@ -480,18 +480,20 @@ static NTSTATUS schan_create_session( void *args )
{
const struct create_session_params *params = args;
schan_credentials *cred = params->cred;
- gnutls_session_t *s = (gnutls_session_t*)¶ms->transport->session;
char priority[128] = "NORMAL:%LATEST_RECORD_VERSION", *p;
BOOL using_vers_all = FALSE, disabled;
unsigned int i, flags = (cred->credential_use == SECPKG_CRED_INBOUND) ? GNUTLS_SERVER : GNUTLS_CLIENT;
+ gnutls_session_t s;
int err;
+ *params->session = 0;
+
if (cred->enabled_protocols & (SP_PROT_DTLS1_0_CLIENT | SP_PROT_DTLS1_2_CLIENT))
{
flags |= GNUTLS_DATAGRAM | GNUTLS_NONBLOCK;
}
- err = pgnutls_init(s, flags);
+ err = pgnutls_init(&s, flags);
if (err != GNUTLS_E_SUCCESS)
{
pgnutls_perror(err);
@@ -524,27 +526,28 @@ static NTSTATUS schan_create_session( void *args )
}
TRACE("Using %s priority\n", debugstr_a(priority));
- err = pgnutls_priority_set_direct(*s, priority, NULL);
+ err = pgnutls_priority_set_direct(s, priority, NULL);
if (err != GNUTLS_E_SUCCESS)
{
pgnutls_perror(err);
- pgnutls_deinit(*s);
+ pgnutls_deinit(s);
return STATUS_INTERNAL_ERROR;
}
- err = pgnutls_credentials_set(*s, GNUTLS_CRD_CERTIFICATE,
+ err = pgnutls_credentials_set(s, GNUTLS_CRD_CERTIFICATE,
(gnutls_certificate_credentials_t)cred->credentials);
if (err != GNUTLS_E_SUCCESS)
{
pgnutls_perror(err);
- pgnutls_deinit(*s);
+ pgnutls_deinit(s);
return STATUS_INTERNAL_ERROR;
}
- pgnutls_transport_set_pull_function(*s, pull_adapter);
- if (flags & GNUTLS_DATAGRAM) pgnutls_transport_set_pull_timeout_function(*s, pull_timeout);
- pgnutls_transport_set_push_function(*s, push_adapter);
- pgnutls_transport_set_ptr(*s, (gnutls_transport_ptr_t)params->transport);
+ pgnutls_transport_set_pull_function(s, pull_adapter);
+ if (flags & GNUTLS_DATAGRAM) pgnutls_transport_set_pull_timeout_function(s, pull_timeout);
+ pgnutls_transport_set_push_function(s, push_adapter);
+ pgnutls_transport_set_ptr(s, (gnutls_transport_ptr_t)params->transport);
+ *params->session = (ULONG_PTR)s;
return STATUS_SUCCESS;
}
diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h
index e4fa0381433..e58303a4e1b 100644
--- a/dlls/secur32/secur32_priv.h
+++ b/dlls/secur32/secur32_priv.h
@@ -126,6 +126,7 @@ struct create_session_params
{
struct schan_transport *transport;
schan_credentials *cred;
+ schan_session *session;
};
struct free_certificate_credentials_params
More information about the wine-cvs
mailing list