wine-commits December 2021

wine-commits@winehq.org

2 participants
569 discussions

Alexandre Julliard : secur32: Move the memory allocation for get_unique_channel_binding() to the PE side.
by Alexandre Julliard 06 Dec '21

06 Dec '21

Module: wine Branch: master Commit: abdae539381c03b874adda6bb8f85b3ec79eef22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=abdae539381c03b874adda6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 15:48:28 2021 +0100 secur32: Move the memory allocation for get_unique_channel_binding() to the PE side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 21 ++++++++++++++++++++- dlls/secur32/schannel_gnutls.c | 21 ++++++--------------- dlls/secur32/secur32_priv.h | 2 +- 3 files changed, 27 insertions(+), 17 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 483e3285f09..432c35cdfde 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1057,8 +1057,27 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesW( } case SECPKG_ATTR_UNIQUE_BINDINGS: { + static const char prefix[] = "tls-unique:"; SecPkgContext_Bindings *bindings = buffer; - return schan_funcs->get_unique_channel_binding(ctx->transport.session, bindings); + ULONG size; + char *p; + + if (schan_funcs->get_unique_channel_binding(ctx->transport.session, NULL, &size) != SEC_E_BUFFER_TOO_SMALL) + return SEC_E_INTERNAL_ERROR; + + bindings->BindingsLength = sizeof(*bindings->Bindings) + sizeof(prefix)-1 + size; + /* freed with FreeContextBuffer */ + bindings->Bindings = RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, bindings->BindingsLength); + if(!bindings->Bindings) + return SEC_E_INSUFFICIENT_MEMORY; + + bindings->Bindings->cbApplicationDataLength = sizeof(prefix)-1 + size; + bindings->Bindings->dwApplicationDataOffset = sizeof(*bindings->Bindings); + + p = (char*)(bindings->Bindings+1); + memcpy(p, prefix, sizeof(prefix)-1); + p += sizeof(prefix)-1; + return schan_funcs->get_unique_channel_binding(ctx->transport.session, p, &size); } case SECPKG_ATTR_APPLICATION_PROTOCOL: { diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 392d10e538b..e4da13c9b3e 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -755,13 +755,11 @@ static SECURITY_STATUS CDECL schan_get_connection_info(schan_session session, Se return SEC_E_OK; } -static SECURITY_STATUS CDECL schan_get_unique_channel_binding(schan_session session, SecPkgContext_Bindings *bindings) +static SECURITY_STATUS CDECL schan_get_unique_channel_binding(schan_session session, void *buffer, ULONG *bufsize) { - static const char prefix[] = "tls-unique:"; gnutls_datum_t datum; int rc; SECURITY_STATUS ret; - char *p; gnutls_session_t s = (gnutls_session_t)session; rc = pgnutls_session_channel_binding(s, GNUTLS_CB_TLS_UNIQUE, &datum); @@ -770,21 +768,14 @@ static SECURITY_STATUS CDECL schan_get_unique_channel_binding(schan_session sess pgnutls_perror(rc); return SEC_E_INTERNAL_ERROR; } - - bindings->BindingsLength = sizeof(SEC_CHANNEL_BINDINGS) + sizeof(prefix)-1 + datum.size; - bindings->Bindings = RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, bindings->BindingsLength); - if (!bindings->Bindings) - ret = SEC_E_INSUFFICIENT_MEMORY; - else + if (buffer && *bufsize >= datum.size) { - bindings->Bindings->cbApplicationDataLength = sizeof(prefix)-1 + datum.size; - bindings->Bindings->dwApplicationDataOffset = sizeof(SEC_CHANNEL_BINDINGS); - p = (char*)(bindings->Bindings+1); - memcpy(p, prefix, sizeof(prefix)-1); - p += sizeof(prefix)-1; - memcpy(p, datum.data, datum.size); + memcpy( buffer, datum.data, datum.size ); ret = SEC_E_OK; } + else ret = SEC_E_BUFFER_TOO_SMALL; + + *bufsize = datum.size; free(datum.data); return ret; } diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 7cad59a51f7..9970c0847e3 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -121,7 +121,7 @@ struct schan_funcs unsigned int (CDECL *get_max_message_size)(schan_session); unsigned int (CDECL *get_session_cipher_block_size)(schan_session); SECURITY_STATUS (CDECL *get_session_peer_certificate)(schan_session, CERT_BLOB *, ULONG *, ULONG *); - SECURITY_STATUS (CDECL *get_unique_channel_binding)(schan_session, SecPkgContext_Bindings *); + SECURITY_STATUS (CDECL *get_unique_channel_binding)(schan_session, void *, ULONG *); SECURITY_STATUS (CDECL *handshake)(schan_session, SecBufferDesc *, SIZE_T, SecBufferDesc *, ULONG ); SECURITY_STATUS (CDECL *recv)(schan_session, SecBufferDesc *, SIZE_T, void *, SIZE_T *); SECURITY_STATUS (CDECL *send)(schan_session, SecBufferDesc *, const void *, SIZE_T *);

1 0

Alexandre Julliard : secur32: Move the memory allocation for get_session_peer_certificate() to the PE side.
by Alexandre Julliard 06 Dec '21

06 Dec '21

Module: wine Branch: master Commit: bcc30639ad6c61a15ac52979805af218502648ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcc30639ad6c61a15ac52979… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 14:31:38 2021 +0100 secur32: Move the memory allocation for get_session_peer_certificate() to the PE side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 23 ++++++++++++++++------- dlls/secur32/schannel_gnutls.c | 28 ++++++++++++++++++---------- dlls/secur32/secur32_priv.h | 8 +------- 3 files changed, 35 insertions(+), 24 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index f9deb5d8a23..483e3285f09 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -909,28 +909,37 @@ static SECURITY_STATUS ensure_remote_cert(struct schan_context *ctx) HCERTSTORE store; PCCERT_CONTEXT cert = NULL; SECURITY_STATUS status; - struct schan_cert_list list; + CERT_BLOB *certs; + ULONG count, size = 0; if (ctx->cert) return SEC_E_OK; if (!(store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL))) return GetLastError(); - if ((status = schan_funcs->get_session_peer_certificate(ctx->transport.session, &list)) == SEC_E_OK) + status = schan_funcs->get_session_peer_certificate(ctx->transport.session, NULL, &size, &count); + if (status != SEC_E_BUFFER_TOO_SMALL) goto done; + if (!(certs = malloc( size ))) + { + status = SEC_E_INSUFFICIENT_MEMORY; + goto done; + } + status = schan_funcs->get_session_peer_certificate(ctx->transport.session, certs, &size, &count); + if (status == SEC_E_OK) { unsigned int i; - for (i = 0; i < list.count; i++) + for (i = 0; i < count; i++) { - if (!CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, list.certs[i].pbData, - list.certs[i].cbData, CERT_STORE_ADD_REPLACE_EXISTING, + if (!CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, certs[i].pbData, + certs[i].cbData, CERT_STORE_ADD_REPLACE_EXISTING, i ? NULL : &cert)) { if (i) CertFreeCertificateContext(cert); return GetLastError(); } } - RtlFreeHeap(GetProcessHeap(), 0, list.certs); } - + free(certs); +done: ctx->cert = cert; CertCloseStore(store, 0); return status; diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 8a540035bdc..392d10e538b 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -810,28 +810,36 @@ static ALG_ID CDECL schan_get_key_signature_algorithm(schan_session session) } } -static SECURITY_STATUS CDECL schan_get_session_peer_certificate(schan_session session, struct schan_cert_list *list) +static SECURITY_STATUS CDECL schan_get_session_peer_certificate(schan_session session, CERT_BLOB *certs, + ULONG *bufsize, ULONG *retcount) { gnutls_session_t s = (gnutls_session_t)session; const gnutls_datum_t *datum; unsigned int i, size; BYTE *ptr; + unsigned int count; - if (!(datum = pgnutls_certificate_get_peers(s, &list->count))) return SEC_E_INTERNAL_ERROR; + if (!(datum = pgnutls_certificate_get_peers(s, &count))) return SEC_E_INTERNAL_ERROR; - size = list->count * sizeof(list->certs[0]); - for (i = 0; i < list->count; i++) size += datum[i].size; - if (!(list->certs = RtlAllocateHeap(GetProcessHeap(), 0, size))) return SEC_E_INSUFFICIENT_MEMORY; + size = count * sizeof(certs[0]); + for (i = 0; i < count; i++) size += datum[i].size; - ptr = (BYTE *)&list->certs[list->count]; - for (i = 0; i < list->count; i++) + if (!certs || *bufsize < size) { - list->certs[i].cbData = datum[i].size; - list->certs[i].pbData = ptr; - memcpy(list->certs[i].pbData, datum[i].data, datum[i].size); + *bufsize = size; + return SEC_E_BUFFER_TOO_SMALL; + } + ptr = (BYTE *)&certs[count]; + for (i = 0; i < count; i++) + { + certs[i].cbData = datum[i].size; + certs[i].pbData = ptr; + memcpy(certs[i].pbData, datum[i].data, datum[i].size); ptr += datum[i].size; } + *bufsize = size; + *retcount = count; return SEC_E_OK; } diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 3552a6aaf38..7cad59a51f7 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -108,12 +108,6 @@ struct schan_transport struct schan_buffers out; }; -struct schan_cert_list -{ - unsigned int count; - CERT_BLOB *certs; -}; - struct schan_funcs { BOOL (CDECL *allocate_certificate_credentials)(schan_credentials *, const CERT_CONTEXT *, const DATA_BLOB *); @@ -126,7 +120,7 @@ struct schan_funcs ALG_ID (CDECL *get_key_signature_algorithm)(schan_session); unsigned int (CDECL *get_max_message_size)(schan_session); unsigned int (CDECL *get_session_cipher_block_size)(schan_session); - SECURITY_STATUS (CDECL *get_session_peer_certificate)(schan_session, struct schan_cert_list *); + SECURITY_STATUS (CDECL *get_session_peer_certificate)(schan_session, CERT_BLOB *, ULONG *, ULONG *); SECURITY_STATUS (CDECL *get_unique_channel_binding)(schan_session, SecPkgContext_Bindings *); SECURITY_STATUS (CDECL *handshake)(schan_session, SecBufferDesc *, SIZE_T, SecBufferDesc *, ULONG ); SECURITY_STATUS (CDECL *recv)(schan_session, SecBufferDesc *, SIZE_T, void *, SIZE_T *);

1 0

Alexandre Julliard : secur32: Move the buffers initialization and callbacks to the Unix side.
by Alexandre Julliard 06 Dec '21

06 Dec '21

Module: wine Branch: master Commit: a4d69c874b2e62055fe8ef4c5ff222d0555bba87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4d69c874b2e62055fe8ef4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 14:09:13 2021 +0100 secur32: Move the buffers initialization and callbacks to the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 116 +--------------------------------- dlls/secur32/schannel_gnutls.c | 137 +++++++++++++++++++++++++++++++++++++++-- dlls/secur32/secur32_priv.h | 6 +- 3 files changed, 137 insertions(+), 122 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a4d69c874b2e62055fe8…

1 0

Alexandre Julliard : secur32: Move the decrypt message receive loop to the Unix side.
by Alexandre Julliard 06 Dec '21

06 Dec '21

Module: wine Branch: master Commit: 9894e109ac5ee0a8f6962f36a09bb5928485661f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9894e109ac5ee0a8f6962f36… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 13:09:43 2021 +0100 secur32: Move the decrypt message receive loop to the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 33 +++++++---------------------- dlls/secur32/schannel_gnutls.c | 48 +++++++++++++++++++++++------------------- 2 files changed, 34 insertions(+), 47 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 0dbffb485e6..4217cc7334f 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1319,7 +1319,7 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle SIZE_T data_size; char *data; unsigned expected_size; - SSIZE_T received = 0; + SIZE_T received = 0; int idx; unsigned char *buf_ptr; @@ -1360,31 +1360,14 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle init_schan_buffers(&ctx->transport.in, message, schan_decrypt_message_get_next_buffer); ctx->transport.in.limit = expected_size; - while (received < data_size) - { - SIZE_T length = data_size - received; - status = schan_funcs->recv(ctx->transport.session, data + received, &length); - - if (status == SEC_I_RENEGOTIATE) - break; - - if (status == SEC_I_CONTINUE_NEEDED) - { - status = SEC_E_OK; - break; - } + received = data_size; + status = schan_funcs->recv(ctx->transport.session, data, &received); - if (status != SEC_E_OK) - { - free(data); - ERR("Returning %x\n", status); - return status; - } - - if (!length) - break; - - received += length; + if (status != SEC_E_OK && status != SEC_I_RENEGOTIATE) + { + free(data); + ERR("Returning %x\n", status); + return status; } TRACE("Received %ld bytes\n", received); diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 7eca22b2967..df137321011 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -756,35 +756,39 @@ static SECURITY_STATUS CDECL schan_send(schan_session session, const void *buffe static SECURITY_STATUS CDECL schan_recv(schan_session session, void *buffer, SIZE_T *length) { gnutls_session_t s = (gnutls_session_t)session; + size_t data_size = *length; + size_t received = 0; ssize_t ret; + SECURITY_STATUS status = SEC_E_OK; -again: - ret = pgnutls_record_recv(s, buffer, *length); - - if (ret >= 0) - *length = ret; - else if (ret == GNUTLS_E_AGAIN) + while (received < data_size) { - struct schan_transport *t = (struct schan_transport *)pgnutls_transport_get_ptr(s); - SIZE_T count = 0; + ret = pgnutls_record_recv(s, (char *)buffer + received, data_size - received); - if (get_buffer(t, &t->in, &count)) - goto again; + if (ret > 0) received += ret; + else if (!ret) break; + else if (ret == GNUTLS_E_AGAIN) + { + struct schan_transport *t = (struct schan_transport *)pgnutls_transport_get_ptr(s); + SIZE_T count = 0; - return SEC_I_CONTINUE_NEEDED; - } - else if (ret == GNUTLS_E_REHANDSHAKE) - { - TRACE("Rehandshake requested\n"); - return SEC_I_RENEGOTIATE; - } - else - { - pgnutls_perror(ret); - return SEC_E_INTERNAL_ERROR; + if (!get_buffer(t, &t->in, &count)) break; + } + else if (ret == GNUTLS_E_REHANDSHAKE) + { + TRACE("Rehandshake requested\n"); + status = SEC_I_RENEGOTIATE; + break; + } + else + { + pgnutls_perror(ret); + return SEC_E_INTERNAL_ERROR; + } } - return SEC_E_OK; + *length = received; + return status; } static unsigned int parse_alpn_protocol_list(unsigned char *buffer, unsigned int buflen, gnutls_datum_t *list)

1 0

Alexandre Julliard : secur32: Move the get_buffer callback to the Unix side.
by Alexandre Julliard 06 Dec '21

06 Dec '21

Module: wine Branch: master Commit: 97ea9ee41ce7281ce3cde56cb9d25db118b30b37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97ea9ee41ce7281ce3cde56c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 12:25:53 2021 +0100 secur32: Move the get_buffer callback to the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 86 +------------------------------------ dlls/secur32/schannel_gnutls.c | 96 ++++++++++++++++++++++++++++++++++++++---- dlls/secur32/secur32_priv.h | 5 --- 3 files changed, 89 insertions(+), 98 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index d35372ed7fc..0dbffb485e6 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -665,85 +665,6 @@ static int schan_find_sec_buffer_idx(const SecBufferDesc *desc, unsigned int sta return -1; } -static void schan_resize_current_buffer(const struct schan_buffers *s, SIZE_T min_size) -{ - SecBuffer *b = &s->desc->pBuffers[s->current_buffer_idx]; - SIZE_T new_size = b->cbBuffer ? b->cbBuffer * 2 : 128; - void *new_data; - - if (b->cbBuffer >= min_size || !s->allow_buffer_resize || min_size > UINT_MAX / 2) return; - - while (new_size < min_size) new_size *= 2; - - if (b->pvBuffer) /* freed with FreeContextBuffer */ - new_data = RtlReAllocateHeap(GetProcessHeap(), 0, b->pvBuffer, new_size); - else - new_data = RtlAllocateHeap(GetProcessHeap(), 0, new_size); - - if (!new_data) - { - TRACE("Failed to resize %p from %d to %ld\n", b->pvBuffer, b->cbBuffer, new_size); - return; - } - - b->cbBuffer = new_size; - b->pvBuffer = new_data; -} - -static char * CDECL schan_get_buffer(const struct schan_transport *t, struct schan_buffers *s, SIZE_T *count) -{ - SIZE_T max_count; - PSecBuffer buffer; - - if (!s->desc) - { - TRACE("No desc\n"); - return NULL; - } - - if (s->current_buffer_idx == -1) - { - /* Initial buffer */ - int buffer_idx = s->get_next_buffer(t, s); - if (buffer_idx == -1) - { - TRACE("No next buffer\n"); - return NULL; - } - s->current_buffer_idx = buffer_idx; - } - - buffer = &s->desc->pBuffers[s->current_buffer_idx]; - TRACE("Using buffer %d: cbBuffer %d, BufferType %#x, pvBuffer %p\n", s->current_buffer_idx, buffer->cbBuffer, buffer->BufferType, buffer->pvBuffer); - - schan_resize_current_buffer(s, s->offset + *count); - max_count = buffer->cbBuffer - s->offset; - if (s->limit != ~0UL && s->limit < max_count) - max_count = s->limit; - if (!max_count) - { - int buffer_idx; - - s->allow_buffer_resize = FALSE; - buffer_idx = s->get_next_buffer(t, s); - if (buffer_idx == -1) - { - TRACE("No next buffer\n"); - return NULL; - } - s->current_buffer_idx = buffer_idx; - s->offset = 0; - return schan_get_buffer(t, s, count); - } - - if (*count > max_count) - *count = max_count; - if (s->limit != ~0UL) - s->limit -= *count; - - return (char *)buffer->pvBuffer + s->offset; -} - static int schan_init_sec_ctx_get_next_input_buffer(const struct schan_transport *t, struct schan_buffers *s) { if (s->current_buffer_idx != -1) @@ -1566,11 +1487,6 @@ static const SecurityFunctionTableW schanTableW = { NULL, /* SetContextAttributesW */ }; -const struct schan_callbacks schan_callbacks = -{ - schan_get_buffer, -}; - void SECUR32_initSchannelSP(void) { /* This is what Windows reports. This shouldn't break any applications @@ -1596,7 +1512,7 @@ void SECUR32_initSchannelSP(void) }; SecureProvider *provider; - if (!schan_funcs && __wine_init_unix_lib(hsecur32, DLL_PROCESS_ATTACH, &schan_callbacks, &schan_funcs)) + if (!schan_funcs && __wine_init_unix_lib(hsecur32, DLL_PROCESS_ATTACH, NULL, &schan_funcs)) { ERR( "no schannel support, expect problems\n" ); return; diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 9b0833efcf5..7eca22b2967 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -52,8 +52,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(secur32); WINE_DECLARE_DEBUG_CHANNEL(winediag); -static const struct schan_callbacks *callbacks; - /* Not present in gnutls version < 2.9.10. */ static int (*pgnutls_cipher_get_block_size)(gnutls_cipher_algorithm_t); @@ -199,6 +197,89 @@ static void compat_gnutls_dtls_set_mtu(gnutls_session_t session, unsigned int mt FIXME("\n"); } +static void resize_current_buffer(const struct schan_buffers *s, SIZE_T min_size) +{ + SecBuffer *b = &s->desc->pBuffers[s->current_buffer_idx]; + SIZE_T new_size = b->cbBuffer ? b->cbBuffer * 2 : 128; + void *new_data; + + if (b->cbBuffer >= min_size || !s->allow_buffer_resize || min_size > UINT_MAX / 2) return; + + while (new_size < min_size) new_size *= 2; + + if (b->pvBuffer) /* freed with FreeContextBuffer */ + new_data = RtlReAllocateHeap(GetProcessHeap(), 0, b->pvBuffer, new_size); + else + new_data = RtlAllocateHeap(GetProcessHeap(), 0, new_size); + + if (!new_data) + { + TRACE("Failed to resize %p from %d to %ld\n", b->pvBuffer, b->cbBuffer, new_size); + return; + } + + b->cbBuffer = new_size; + b->pvBuffer = new_data; +} + +static char *get_buffer(const struct schan_transport *t, struct schan_buffers *s, SIZE_T *count) +{ + SIZE_T max_count; + PSecBuffer buffer; + + if (!s->desc) + { + TRACE("No desc\n"); + return NULL; + } + + if (s->current_buffer_idx == -1) + { + /* Initial buffer */ + int buffer_idx = s->get_next_buffer(t, s); + if (buffer_idx == -1) + { + TRACE("No next buffer\n"); + return NULL; + } + s->current_buffer_idx = buffer_idx; + } + + buffer = &s->desc->pBuffers[s->current_buffer_idx]; + TRACE("Using buffer %d: cbBuffer %d, BufferType %#x, pvBuffer %p\n", s->current_buffer_idx, buffer->cbBuffer, buffer->BufferType, buffer->pvBuffer); + + resize_current_buffer(s, s->offset + *count); + max_count = buffer->cbBuffer - s->offset; + if (s->limit != ~0UL && s->limit < max_count) + max_count = s->limit; + + while (!max_count) + { + int buffer_idx; + + s->allow_buffer_resize = FALSE; + buffer_idx = s->get_next_buffer(t, s); + if (buffer_idx == -1) + { + TRACE("No next buffer\n"); + return NULL; + } + s->current_buffer_idx = buffer_idx; + s->offset = 0; + buffer = &s->desc->pBuffers[buffer_idx]; + max_count = buffer->cbBuffer; + if (s->limit != ~0UL && s->limit < max_count) + max_count = s->limit; + } + + if (*count > max_count) + *count = max_count; + if (s->limit != ~0UL) + s->limit -= *count; + + return (char *)buffer->pvBuffer + s->offset; +} + static ssize_t pull_adapter(gnutls_transport_ptr_t transport, void *buff, size_t buff_len) { struct schan_transport *t = (struct schan_transport*)transport; @@ -208,7 +289,7 @@ static ssize_t pull_adapter(gnutls_transport_ptr_t transport, void *buff, size_t TRACE("Push %lu bytes\n", len); - b = callbacks->get_buffer(t, &t->in, &len); + b = get_buffer(t, &t->in, &len); if (!b) { pgnutls_transport_set_errno(s, EAGAIN); @@ -229,7 +310,7 @@ static ssize_t push_adapter(gnutls_transport_ptr_t transport, const void *buff, TRACE("Push %lu bytes\n", len); - b = callbacks->get_buffer(t, &t->out, &len); + b = get_buffer(t, &t->out, &len); if (!b) { pgnutls_transport_set_errno(s, EAGAIN); @@ -300,7 +381,7 @@ static int pull_timeout(gnutls_transport_ptr_t transport, unsigned int timeout) TRACE("\n"); - if (callbacks->get_buffer(t, &t->in, &count)) return 1; + if (get_buffer(t, &t->in, &count)) return 1; pgnutls_transport_set_errno(s, EAGAIN); return -1; } @@ -661,7 +742,7 @@ static SECURITY_STATUS CDECL schan_send(schan_session session, const void *buffe struct schan_transport *t = (struct schan_transport *)pgnutls_transport_get_ptr(s); SIZE_T count = 0; - if (callbacks->get_buffer(t, &t->out, &count)) continue; + if (get_buffer(t, &t->out, &count)) continue; return SEC_I_CONTINUE_NEEDED; } else @@ -687,7 +768,7 @@ again: struct schan_transport *t = (struct schan_transport *)pgnutls_transport_get_ptr(s); SIZE_T count = 0; - if (callbacks->get_buffer(t, &t->in, &count)) + if (get_buffer(t, &t->in, &count)) goto again; return SEC_I_CONTINUE_NEEDED; @@ -1118,7 +1199,6 @@ NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *p { case DLL_PROCESS_ATTACH: if (!gnutls_initialize()) return STATUS_DLL_NOT_FOUND; - callbacks = ptr_in; *(const struct schan_funcs **)ptr_out = &funcs; break; case DLL_PROCESS_DETACH: diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 88effe07a81..e4c39e476bc 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -137,11 +137,6 @@ struct schan_funcs void (CDECL *set_session_transport)(schan_session, struct schan_transport *); }; -struct schan_callbacks -{ - char * (CDECL *get_buffer)(const struct schan_transport *, struct schan_buffers *, SIZE_T *); -}; - extern const struct schan_funcs *schan_funcs; #endif /* __SECUR32_PRIV_H__ */

1 0

Alexandre Julliard : secur32: Store the GnuTLS session inside the transport.
by Alexandre Julliard 06 Dec '21

06 Dec '21

Module: wine Branch: master Commit: 4e579d49a77c5a673589de0a2ce020c660be7124 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e579d49a77c5a673589de0a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 12:07:36 2021 +0100 secur32: Store the GnuTLS session inside the transport. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 45 ++++++++++++++++++------------------------ dlls/secur32/schannel_gnutls.c | 6 +++--- dlls/secur32/secur32_priv.h | 2 +- 3 files changed, 23 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4e579d49a77c5a673589…

1 0

Alexandre Julliard : secur32: Move the pull/push callbacks to the Unix side.
by Alexandre Julliard 06 Dec '21

06 Dec '21

Module: wine Branch: master Commit: 37eab1f496b1e7540631760956a5ca97ef4d4b76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37eab1f496b1e75406317609… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 11:59:44 2021 +0100 secur32: Move the pull/push callbacks to the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 80 ------------------------------------------ dlls/secur32/schannel_gnutls.c | 38 ++++++++++---------- dlls/secur32/secur32_priv.h | 2 -- 3 files changed, 20 insertions(+), 100 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 895364a3fc7..e3c5ab76088 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -745,84 +745,6 @@ static char * CDECL schan_get_buffer(const struct schan_transport *t, struct sch return (char *)buffer->pvBuffer + s->offset; } -/* schan_pull - * Read data from the transport input buffer. - * - * t - The session transport object. - * buff - The buffer into which to store the read data. Must be at least - * *buff_len bytes in length. - * buff_len - On input, *buff_len is the desired length to read. On successful - * return, *buff_len is the number of bytes actually read. - * - * Returns: - * 0 on success, in which case: - * *buff_len == 0 indicates end of file. - * *buff_len > 0 indicates that some data was read. May be less than - * what was requested, in which case the caller should call again if/ - * when they want more. - * -1 when no data could be read without blocking - * another errno-style error value on failure - */ -static int CDECL schan_pull(struct schan_transport *t, void *buff, size_t *buff_len) -{ - char *b; - SIZE_T local_len = *buff_len; - - TRACE("Pull %lu bytes\n", local_len); - - *buff_len = 0; - - b = schan_get_buffer(t, &t->in, &local_len); - if (!b) - return -1; - - memcpy(buff, b, local_len); - t->in.offset += local_len; - - TRACE("Read %lu bytes\n", local_len); - - *buff_len = local_len; - return 0; -} - -/* schan_push - * Write data to the transport output buffer. - * - * t - The session transport object. - * buff - The buffer of data to write. Must be at least *buff_len bytes in length. - * buff_len - On input, *buff_len is the desired length to write. On successful - * return, *buff_len is the number of bytes actually written. - * - * Returns: - * 0 on success - * *buff_len will be > 0 indicating how much data was written. May be less - * than what was requested, in which case the caller should call again - * if/when they want to write more. - * -1 when no data could be written without blocking - * another errno-style error value on failure - */ -static int CDECL schan_push(struct schan_transport *t, const void *buff, size_t *buff_len) -{ - char *b; - SIZE_T local_len = *buff_len; - - TRACE("Push %lu bytes\n", local_len); - - *buff_len = 0; - - b = schan_get_buffer(t, &t->out, &local_len); - if (!b) - return -1; - - memcpy(b, buff, local_len); - t->out.offset += local_len; - - TRACE("Wrote %lu bytes\n", local_len); - - *buff_len = local_len; - return 0; -} - static schan_session CDECL schan_get_session_for_transport(struct schan_transport* t) { return t->ctx->session; @@ -1654,8 +1576,6 @@ const struct schan_callbacks schan_callbacks = { schan_get_buffer, schan_get_session_for_transport, - schan_pull, - schan_push, }; void SECUR32_initSchannelSP(void) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index e02b1643e30..117a9da42d5 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -203,40 +203,42 @@ static ssize_t pull_adapter(gnutls_transport_ptr_t transport, void *buff, size_t { struct schan_transport *t = (struct schan_transport*)transport; gnutls_session_t s = (gnutls_session_t)callbacks->get_session_for_transport(t); + SIZE_T len = buff_len; + char *b; - int ret = callbacks->pull(transport, buff, &buff_len); - if (ret == -1) + TRACE("Push %lu bytes\n", len); + + b = callbacks->get_buffer(t, &t->in, &len); + if (!b) { pgnutls_transport_set_errno(s, EAGAIN); return -1; } - if (ret < 0) - { - FIXME("unhandled error from pull callback %d\n", ret); - return -1; - } - - return buff_len; + memcpy(buff, b, len); + t->in.offset += len; + TRACE("Wrote %lu bytes\n", len); + return len; } static ssize_t push_adapter(gnutls_transport_ptr_t transport, const void *buff, size_t buff_len) { struct schan_transport *t = (struct schan_transport*)transport; gnutls_session_t s = (gnutls_session_t)callbacks->get_session_for_transport(t); + SIZE_T len = buff_len; + char *b; - int ret = callbacks->push(transport, buff, &buff_len); - if (ret == -1) + TRACE("Push %lu bytes\n", len); + + b = callbacks->get_buffer(t, &t->out, &len); + if (!b) { pgnutls_transport_set_errno(s, EAGAIN); return -1; } - if (ret < 0) - { - FIXME("unhandled error from push callback %d\n", ret); - return -1; - } - - return buff_len; + memcpy(b, buff, len); + t->out.offset += len; + TRACE("Wrote %lu bytes\n", len); + return len; } static const struct { diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 75c6cde2e42..eedb1f4bfb2 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -140,8 +140,6 @@ struct schan_callbacks { char * (CDECL *get_buffer)(const struct schan_transport *, struct schan_buffers *, SIZE_T *); schan_session (CDECL *get_session_for_transport)(struct schan_transport *); - int CDECL (CDECL *pull)(struct schan_transport *, void *, size_t *); - int CDECL (CDECL *push)(struct schan_transport *, const void *, size_t *); }; extern const struct schan_funcs *schan_funcs;

1 0

Alexandre Julliard : Wine release 6.23
by Alexandre Julliard 03 Dec '21

03 Dec '21

Module: website Branch: master Commit: cdda2bb01155610fe89f8549210f57f65445ae7f URL: https://source.winehq.org/git/website.git/?a=commit;h=cdda2bb01155610fe89f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 22:19:18 2021 +0100 Wine release 6.23 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021120302.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2021120302.xml b/news/en/2021120302.xml new file mode 100644 index 00000000..157ebe2d --- /dev/null +++ b/news/en/2021120302.xml @@ -0,0 +1,17 @@ +<news> +<date>December 3, 2021</date> +<title>Wine 6.23 Released</title> +<body> + The Wine development release 6.23 is now available. + <a href="{$root}/announce/6.23">What's new</a> in this release: +<ul> + <li>Mount manager and CoreAudio driver converted to PE.</li> + <li>Support for exception handling in Wow64 mode.</li> + <li>Optional support for using the distribution's PE libraries.</li> + <li>A number of UI improvements in WineDbg.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/6.x/wine-6.23.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-6.23 : Alexandre Julliard : Release 6.23
by Alexandre Julliard 03 Dec '21

03 Dec '21

Module: wine Branch: refs/tags/wine-6.23 Tag: c7086213cbb4c55c082a699e12054873974af70d URL: https://source.winehq.org/git/wine.git/?a=tag;h=c7086213cbb4c55c082a699e120… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 22:17:11 2021 +0100 Release 6.23

1 0

Alexandre Julliard : Release 6.23.
by Alexandre Julliard 03 Dec '21

03 Dec '21

Module: wine Branch: master Commit: 3f6102080e632b9f4d8a97c0f0b1231fbd8e759b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f6102080e632b9f4d8a97c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 22:17:11 2021 +0100 Release 6.23. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 1076 +++++++++++++++++++++++++++++++------------------------------ AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 550 insertions(+), 547 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3f6102080e632b9f4d8a…

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2021