December 2021 - Wine-Commits

Alexandre Julliard : secur32: Move the decrypt message receive loop to the Unix side.
by Alexandre Julliard Dec. 6, 2021

Dec. 6, 2021

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: Convert the Unix library to the __wine_unix_call interface.
by Alexandre Julliard Dec. 6, 2021

Dec. 6, 2021

Module: wine Branch: master Commit: 392bdb85e73b0287c21626b489957bf076137674 URL: https://source.winehq.org/git/wine.git/?a=commit;h=392bdb85e73b0287c21626b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 4 13:18:34 2021 +0100 secur32: Convert the Unix library to the __wine_unix_call interface. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/Makefile.in | 1 + dlls/secur32/schannel.c | 124 +++++++++++++++------ dlls/secur32/schannel_gnutls.c | 245 +++++++++++++++++++++-------------------- dlls/secur32/secur32_priv.h | 142 ++++++++++++++++++++---- 4 files changed, 331 insertions(+), 181 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=392bdb85e73b0287c216…

1 0

Alexandre Julliard : secur32: Store the GnuTLS session inside the transport.
by Alexandre Julliard Dec. 6, 2021

Dec. 6, 2021

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 buffers initialization and callbacks to the Unix side.
by Alexandre Julliard Dec. 6, 2021

Dec. 6, 2021

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 memory allocation for get_session_peer_certificate() to the PE side.
by Alexandre Julliard Dec. 6, 2021

Dec. 6, 2021

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 memory allocation for get_unique_channel_binding() to the PE side.
by Alexandre Julliard Dec. 6, 2021

Dec. 6, 2021

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: Pre-allocate the token buffer for handshake() on the PE side.
by Alexandre Julliard Dec. 6, 2021

Dec. 6, 2021

Module: wine Branch: master Commit: 1cf48b46845c1364e5d032924a700f372f7b0628 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cf48b46845c1364e5d03292… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 18:24:24 2021 +0100 secur32: Pre-allocate the token buffer for handshake() on the PE side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 17 ++++++++++++++++- dlls/secur32/schannel_gnutls.c | 41 +++++++---------------------------------- dlls/secur32/secur32_priv.h | 4 ++-- 3 files changed, 25 insertions(+), 37 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 432c35cdfde..14645080f38 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -689,12 +689,14 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( PSecBufferDesc pInput, ULONG Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput, ULONG *pfContextAttr, PTimeStamp ptsExpiry) { + const ULONG extra_size = 0x10000; struct schan_context *ctx; struct schan_buffers *out_buffers; struct schan_credentials *cred; SIZE_T expected_size = ~0UL; SECURITY_STATUS ret; SecBuffer *buffer; + SecBuffer alloc_buffer = { 0 }; int idx; TRACE("%p %p %s 0x%08x %d %d %p %d %p %p %p %p\n", phCredential, phContext, @@ -814,19 +816,32 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( ctx->req_ctx_attr = fContextReq; /* Perform the TLS handshake */ - ret = schan_funcs->handshake(ctx->transport.session, pInput, expected_size, pOutput, fContextReq); + if (fContextReq & ISC_REQ_ALLOCATE_MEMORY) + { + alloc_buffer.cbBuffer = extra_size; + alloc_buffer.BufferType = SECBUFFER_TOKEN; + alloc_buffer.pvBuffer = RtlAllocateHeap( GetProcessHeap(), 0, extra_size ); + } + ret = schan_funcs->handshake(ctx->transport.session, pInput, expected_size, pOutput, &alloc_buffer); out_buffers = &ctx->transport.out; if (out_buffers->current_buffer_idx != -1) { SecBuffer *buffer = &out_buffers->desc->pBuffers[out_buffers->current_buffer_idx]; buffer->cbBuffer = out_buffers->offset; + if (buffer->pvBuffer == alloc_buffer.pvBuffer) + { + RtlReAllocateHeap( GetProcessHeap(), HEAP_REALLOC_IN_PLACE_ONLY, + buffer->pvBuffer, buffer->cbBuffer ); + alloc_buffer.pvBuffer = NULL; + } } else if (out_buffers->desc && out_buffers->desc->cBuffers > 0) { SecBuffer *buffer = &out_buffers->desc->pBuffers[0]; buffer->cbBuffer = 0; } + RtlFreeHeap( GetProcessHeap(), 0, alloc_buffer.pvBuffer ); if(ctx->transport.in.offset && ctx->transport.in.offset != pInput->pBuffers[0].cbBuffer) { if(pInput->cBuffers<2 || pInput->pBuffers[1].BufferType!=SECBUFFER_EMPTY) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index e4da13c9b3e..d832c353fcd 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -204,7 +204,7 @@ static void init_schan_buffers(struct schan_buffers *s, const PSecBufferDesc des s->limit = ~0UL; s->desc = desc; s->current_buffer_idx = -1; - s->allow_buffer_resize = FALSE; + s->alloc_buffer = NULL; s->get_next_buffer = get_next_buffer; } @@ -240,10 +240,9 @@ static int handshake_get_next_buffer_alloc(const struct schan_transport *t, stru idx = schan_find_sec_buffer_idx(s->desc, 0, SECBUFFER_EMPTY); if (idx != -1) s->desc->pBuffers[idx].BufferType = SECBUFFER_TOKEN; } - if (idx != -1 && !s->desc->pBuffers[idx].pvBuffer) + if (idx != -1 && !s->desc->pBuffers[idx].pvBuffer && s->alloc_buffer) { - s->desc->pBuffers[idx].cbBuffer = 0; - s->allow_buffer_resize = TRUE; + s->desc->pBuffers[idx] = *s->alloc_buffer; } return idx; } @@ -302,31 +301,6 @@ static int recv_message_get_next_buffer(const struct schan_transport *t, struct return schan_find_sec_buffer_idx(s->desc, 0, SECBUFFER_DATA); } -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; @@ -353,7 +327,6 @@ static char *get_buffer(const struct schan_transport *t, struct schan_buffers *s 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; @@ -362,7 +335,6 @@ static char *get_buffer(const struct schan_transport *t, struct schan_buffers *s { int buffer_idx; - s->allow_buffer_resize = FALSE; buffer_idx = s->get_next_buffer(t, s); if (buffer_idx == -1) { @@ -580,7 +552,8 @@ static void CDECL schan_set_session_target(schan_session session, const char *ta } static SECURITY_STATUS CDECL schan_handshake(schan_session session, SecBufferDesc *input, - SIZE_T input_size, SecBufferDesc *output, ULONG flags ) + SIZE_T input_size, SecBufferDesc *output, + SecBuffer *alloc_buffer ) { gnutls_session_t s = (gnutls_session_t)session; struct schan_transport *t = (struct schan_transport *)pgnutls_transport_get_ptr(s); @@ -588,8 +561,8 @@ static SECURITY_STATUS CDECL schan_handshake(schan_session session, SecBufferDes init_schan_buffers(&t->in, input, handshake_get_next_buffer); t->in.limit = input_size; - init_schan_buffers(&t->out, output, (flags & ISC_REQ_ALLOCATE_MEMORY) ? - handshake_get_next_buffer_alloc : handshake_get_next_buffer ); + init_schan_buffers(&t->out, output, handshake_get_next_buffer_alloc ); + t->out.alloc_buffer = alloc_buffer; while(1) { err = pgnutls_handshake(s); diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 9970c0847e3..6bfa1ff7a26 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -95,8 +95,8 @@ struct schan_buffers SIZE_T offset; SIZE_T limit; const SecBufferDesc *desc; + SecBuffer *alloc_buffer; int current_buffer_idx; - BOOL allow_buffer_resize; int (*get_next_buffer)(const struct schan_transport *, struct schan_buffers *); }; @@ -122,7 +122,7 @@ struct schan_funcs 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, void *, ULONG *); - SECURITY_STATUS (CDECL *handshake)(schan_session, SecBufferDesc *, SIZE_T, SecBufferDesc *, ULONG ); + SECURITY_STATUS (CDECL *handshake)(schan_session, SecBufferDesc *, SIZE_T, SecBufferDesc *, SecBuffer * ); SECURITY_STATUS (CDECL *recv)(schan_session, SecBufferDesc *, SIZE_T, void *, SIZE_T *); SECURITY_STATUS (CDECL *send)(schan_session, SecBufferDesc *, const void *, SIZE_T *); void (CDECL *set_application_protocols)(schan_session, unsigned char *, unsigned int);

1 0

Alexandre Julliard : Wine release 6.23
by Alexandre Julliard Dec. 3, 2021

Dec. 3, 2021

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

Hans Leidekker : bcrypt: Use CRT memory allocators.
by Alexandre Julliard Dec. 3, 2021

Dec. 3, 2021

Module: wine Branch: master Commit: ab4edfd8621d4811ce9a74d066eef0904a45a74f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab4edfd8621d4811ce9a74d0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 3 15:49:31 2021 +0100 bcrypt: Use CRT memory allocators. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 90 +++++++++++++++++++++++------------------------ 1 file changed, 44 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ab4edfd8621d4811ce9a…

1 0

Paul Gofman : ntdll: Set rcx on exit from syscall dispatcher on x64.
by Alexandre Julliard Dec. 3, 2021

Dec. 3, 2021

Module: wine Branch: master Commit: 3f20261eaf188e923d0b4c5df854204088ed0dda URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f20261eaf188e923d0b4c5d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Dec 1 15:38:18 2021 +0300 ntdll: Set rcx on exit from syscall dispatcher on x64. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 76 +++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/signal_x86_64.c | 11 +++--- 2 files changed, 83 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 5ebb6f25f8b..dd4f4a35344 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -4916,6 +4916,81 @@ static void test_unwind_from_apc(void) ok(pass == 4, "Got unexpected pass %d.\n", pass); ok(test_unwind_apc_called, "Test user APC was not called.\n"); } + +static void test_syscall_clobbered_regs(void) +{ + struct regs + { + UINT64 rcx; + }; + static const BYTE code[] = + { + 0x48, 0x8d, 0x05, 0x00, 0x10, 0x00, 0x00, + /* leaq 0x1000(%rip),%rax */ + 0x48, 0x25, 0x00, 0xf0, 0xff, 0xff, + /* andq $~0xfff,%rax */ + 0x48, 0x83, 0xe8, 0x08, /* subq $8,%rax */ + 0x48, 0x89, 0x20, /* movq %rsp,0(%rax) */ + 0x48, 0x89, 0xc4, /* movq %rax,%rsp */ + 0x41, 0x50, /* push %r8 */ + 0x53, 0x55, 0x57, 0x56, 0x41, 0x54, 0x41, 0x55, 0x41, 0x56, 0x41, 0x57, + /* push %rbx, %rbp, %rdi, %rsi, %r12, %r13, %r14, %r15 */ + 0x41, 0xff, 0xd1, /* callq *r9 */ + 0x41, 0x5f, 0x41, 0x5e, 0x41, 0x5d, 0x41, 0x5c, 0x5e, 0x5f, 0x5d, 0x5b, + /* pop %r15, %r14, %r13, %r12, %rsi, %rdi, %rbp, %rbx */ + 0x41, 0x58, /* pop %r8 */ + 0x49, 0x89, 0x48, 0x00, /* mov %rcx,(%r8) */ + 0x5c, /* pop %rsp */ + 0xc3, /* ret */ + }; + + NTSTATUS (WINAPI *func)(void *arg1, void *arg2, struct regs *, void *call_addr); + NTSTATUS (WINAPI *pNtCancelTimer)(HANDLE, BOOLEAN *); + HMODULE hntdll = GetModuleHandleA("ntdll.dll"); + struct regs regs; + CONTEXT context; + NTSTATUS status; + + pNtCancelTimer = (void *)GetProcAddress(hntdll, "NtCancelTimer"); + ok(!!pNtCancelTimer, "NtCancelTimer not found.\n"); + memcpy(code_mem, code, sizeof(code)); + func = code_mem; + memset(&regs, 0, sizeof(regs)); + status = func((HANDLE)0xdeadbeef, NULL, &regs, pNtCancelTimer); + ok(status == STATUS_INVALID_HANDLE, "Got unexpected status %#x.\n", status); + + /* After the syscall instruction rcx contains the address of the instruction next after syscall. */ + ok((BYTE *)regs.rcx > (BYTE *)pNtCancelTimer && (BYTE *)regs.rcx < (BYTE *)pNtCancelTimer + 0x20, + "Got unexpected rcx %s, pNtCancelTimer %p.\n", wine_dbgstr_longlong(regs.rcx), pNtCancelTimer); + + status = func((HANDLE)0xdeadbeef, (BOOLEAN *)0xdeadbeef, &regs, pNtCancelTimer); + ok(status == STATUS_ACCESS_VIOLATION, "Got unexpected status %#x.\n", status); + ok((BYTE *)regs.rcx > (BYTE *)pNtCancelTimer && (BYTE *)regs.rcx < (BYTE *)pNtCancelTimer + 0x20, + "Got unexpected rcx %s, pNtCancelTimer %p.\n", wine_dbgstr_longlong(regs.rcx), pNtCancelTimer); + + context.ContextFlags = CONTEXT_CONTROL; + status = func(GetCurrentThread(), &context, &regs, pNtGetContextThread); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok((BYTE *)regs.rcx > (BYTE *)pNtGetContextThread && (BYTE *)regs.rcx < (BYTE *)pNtGetContextThread + 0x20, + "Got unexpected rcx %s, pNtGetContextThread %p.\n", wine_dbgstr_longlong(regs.rcx), pNtGetContextThread); + + status = func(GetCurrentThread(), &context, &regs, pNtSetContextThread); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok((BYTE *)regs.rcx > (BYTE *)pNtGetContextThread && (BYTE *)regs.rcx < (BYTE *)pNtGetContextThread + 0x20, + "Got unexpected rcx %s, pNtGetContextThread %p.\n", wine_dbgstr_longlong(regs.rcx), pNtGetContextThread); + + context.ContextFlags = CONTEXT_INTEGER; + status = func(GetCurrentThread(), &context, &regs, pNtGetContextThread); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok((BYTE *)regs.rcx > (BYTE *)pNtGetContextThread && (BYTE *)regs.rcx < (BYTE *)pNtGetContextThread + 0x20, + "Got unexpected rcx %s, pNtGetContextThread %p.\n", wine_dbgstr_longlong(regs.rcx), pNtGetContextThread); + + status = func(GetCurrentThread(), &context, &regs, pNtSetContextThread); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok((BYTE *)regs.rcx > (BYTE *)pNtSetContextThread && (BYTE *)regs.rcx < (BYTE *)pNtSetContextThread + 0x20, + "Got unexpected rcx %s, pNtSetContextThread %p.\n", wine_dbgstr_longlong(regs.rcx), pNtSetContextThread); + +} #elif defined(__arm__) #define UNW_FLAG_NHANDLER 0 @@ -10657,6 +10732,7 @@ START_TEST(exception) test_extended_context(); test_copy_context(); test_unwind_from_apc(); + test_syscall_clobbered_regs(); #elif defined(__aarch64__) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 9972faf799c..9e9a96db832 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -3226,18 +3226,21 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "testl $0x3,%edx\n\t" /* CONTEXT_CONTROL | CONTEXT_INTEGER */ "jnz 1f\n\t" "movq 0x88(%rcx),%rsp\n\t" - "jmpq *0x70(%rcx)\n" /* frame->rip */ + "movq 0x70(%rcx),%rcx\n\t" /* frame->rip */ + "jmpq *%rcx\n\t" "1:\tleaq 0x70(%rcx),%rsp\n\t" "testl $0x2,%edx\n\t" /* CONTEXT_INTEGER */ - "jz 1f\n\t" - "movq 0x00(%rcx),%rax\n\t" + "jnz 1f\n\t" + "movq (%rsp),%rcx\n\t" /* frame->rip */ + "iretq\n" + "1:\tmovq 0x00(%rcx),%rax\n\t" "movq 0x18(%rcx),%rdx\n\t" "movq 0x30(%rcx),%r8\n\t" "movq 0x38(%rcx),%r9\n\t" "movq 0x40(%rcx),%r10\n\t" "movq 0x48(%rcx),%r11\n\t" "movq 0x10(%rcx),%rcx\n" - "1:\tiretq\n" + "iretq\n" "5:\tmovl $0xc000000d,%edx\n\t" /* STATUS_INVALID_PARAMETER */ "movq %rsp,%rcx\n" __ASM_NAME("__wine_syscall_dispatcher_return") ":\n\t"

1 0