March 2011 - Wine-Commits - list.winehq.org

Ken Thomases : secur32: Make no-implementation error message non-GnuTLS-specific.
by Alexandre Julliard March 14, 2011

March 14, 2011

Module: wine Branch: master Commit: c890bf4dc8dae67ff4119de78bfd49d84c6b5ddf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c890bf4dc8dae67ff4119de78… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 13 18:58:36 2011 -0500 secur32: Make no-implementation error message non-GnuTLS-specific. --- dlls/secur32/schannel.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 0e49112..4cebf4b 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1757,7 +1757,7 @@ void SECUR32_deinitSchannelSP(void) void SECUR32_initSchannelSP(void) { - ERR("libgnutls not found, SSL connections will fail\n"); + ERR("TLS library not found, SSL connections will fail\n"); } void SECUR32_deinitSchannelSP(void) {}

1 0

Jacek Caban : mshtml: Reimplement nsIURI::SetScheme on top of IUri.
by Alexandre Julliard March 14, 2011

March 14, 2011

Module: wine Branch: master Commit: cdb7bc451b942be8e783c29ca9113af774e4088b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdb7bc451b942be8e783c29ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 14 14:06:37 2011 +0100 mshtml: Reimplement nsIURI::SetScheme on top of IUri. --- dlls/mshtml/nsio.c | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 327b191..016356d 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1725,16 +1725,27 @@ static nsresult NSAPI nsURI_GetScheme(nsIURL *iface, nsACString *aScheme) static nsresult NSAPI nsURI_SetScheme(nsIURL *iface, const nsACString *aScheme) { nsWineURI *This = impl_from_nsIURL(iface); + const char *schemea; + WCHAR *scheme; + HRESULT hres; TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aScheme)); - if(This->nsuri) { - invalidate_uri(This); - return nsIURI_SetScheme(This->nsuri, aScheme); - } + if(!ensure_uri_builder(This)) + return NS_ERROR_UNEXPECTED; - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + nsACString_GetData(aScheme, &schemea); + scheme = heap_strdupAtoW(schemea); + if(!scheme) + return NS_ERROR_OUT_OF_MEMORY; + + hres = IUriBuilder_SetSchemeName(This->uri_builder, scheme); + heap_free(scheme); + if(FAILED(hres)) + return NS_ERROR_UNEXPECTED; + + sync_wine_url(This); + return NS_OK; } static nsresult NSAPI nsURI_GetUserPass(nsIURL *iface, nsACString *aUserPass)

1 0

Marcus Meissner : mshtml: Removed duplicate const (Coverity).
by Alexandre Julliard March 14, 2011

March 14, 2011

Module: wine Branch: master Commit: 63b05794a7c64b1f1a3db67695ecd4ab3a287880 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63b05794a7c64b1f1a3db6769… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Mar 14 05:28:42 2011 +0100 mshtml: Removed duplicate const (Coverity). --- dlls/mshtml/tests/activex.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 241342b..486acce 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -101,7 +101,7 @@ static const char object_ax_str[] = "</object>" "</body></html>"; -static const REFIID pluginhost_iids[] = { +static REFIID pluginhost_iids[] = { &IID_IOleClientSite, &IID_IAdviseSink, &IID_IAdviseSinkEx,

1 0

Jacek Caban : mshtml: Properly handle BLOCKED:: URLs in IHTMLImgElement:: get_src.
by Alexandre Julliard March 14, 2011

March 14, 2011

Module: wine Branch: master Commit: 0ef8f70e114fcba6845b8b3cab25fdc405efc297 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ef8f70e114fcba6845b8b3ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 14 14:07:09 2011 +0100 mshtml: Properly handle BLOCKED:: URLs in IHTMLImgElement::get_src. --- dlls/mshtml/htmlimg.c | 22 ++++++++++++++++------ dlls/mshtml/tests/dom.c | 38 ++++++++++++++++++++++++++++++++------ 2 files changed, 48 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 1008f87..1fb0e83 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -287,21 +287,31 @@ static HRESULT WINAPI HTMLImgElement_get_src(IHTMLImgElement *iface, BSTR *p) const PRUnichar *src; nsAString src_str; nsresult nsres; - HRESULT hres; + HRESULT hres = S_OK; + + static const WCHAR blockedW[] = {'B','L','O','C','K','E','D',':',':',0}; TRACE("(%p)->(%p)\n", This, p); nsAString_Init(&src_str, NULL); nsres = nsIDOMHTMLImageElement_GetSrc(This->nsimg, &src_str); - if(NS_FAILED(nsres)) { + if(NS_SUCCEEDED(nsres)) { + nsAString_GetData(&src_str, &src); + + if(!strncmpiW(src, blockedW, sizeof(blockedW)/sizeof(WCHAR)-1)) { + TRACE("returning BLOCKED::\n"); + *p = SysAllocString(blockedW); + if(!*p) + hres = E_OUTOFMEMORY; + }else { + hres = nsuri_to_url(src, TRUE, p); + } + }else { ERR("GetSrc failed: %08x\n", nsres); - return E_FAIL; + hres = E_FAIL; } - nsAString_GetData(&src_str, &src); - hres = nsuri_to_url(src, TRUE, p); nsAString_Finish(&src_str); - return hres; } diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ec6c7e8..64e0cf2 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2161,8 +2161,8 @@ static void _elem_get_scroll_left(unsigned line, IUnknown *unk) ok(l == l2, "unexpected left %d, expected %d\n", l2, l); } -#define test_img_src(i,s) _test_img_src(__LINE__,i,s) -static void _test_img_src(unsigned line, IUnknown *unk, const char *exsrc) +#define test_img_src(a,b,c) _test_img_src(__LINE__,a,b,c) +static void _test_img_src(unsigned line, IUnknown *unk, const char *exsrc, const char *broken_src) { IHTMLImgElement *img = _get_img_iface(line, unk); BSTR src; @@ -2171,7 +2171,8 @@ static void _test_img_src(unsigned line, IUnknown *unk, const char *exsrc) hres = IHTMLImgElement_get_src(img, &src); IHTMLImgElement_Release(img); ok_(__FILE__,line) (hres == S_OK, "get_src failed: %08x\n", hres); - ok_(__FILE__,line) (!strcmp_wa(src, exsrc), "get_src returned %s expected %s\n", wine_dbgstr_w(src), exsrc); + ok_(__FILE__,line) (!strcmp_wa(src, exsrc) || (broken_src && broken(!strcmp_wa(src, broken_src))), + "get_src returned %s expected %s\n", wine_dbgstr_w(src), exsrc); SysFreeString(src); } @@ -2187,8 +2188,6 @@ static void _test_img_set_src(unsigned line, IUnknown *unk, const char *src) IHTMLImgElement_Release(img); SysFreeString(tmp); ok_(__FILE__,line) (hres == S_OK, "put_src failed: %08x\n", hres); - - _test_img_src(line, unk, src); } #define test_img_alt(u,a) _test_img_alt(__LINE__,u,a) @@ -6574,8 +6573,9 @@ static void test_elems(IHTMLDocument2 *doc) elem = get_elem_by_id(doc, "imgid", TRUE); if(elem) { - test_img_src((IUnknown*)elem, ""); + test_img_src((IUnknown*)elem, "", NULL); test_img_set_src((IUnknown*)elem, "about:blank"); + test_img_src((IUnknown*)elem, "about:blank", NULL); test_img_alt((IUnknown*)elem, NULL); test_img_set_alt((IUnknown*)elem, "alt test"); test_img_name((IUnknown*)elem, "WineImg"); @@ -6852,6 +6852,31 @@ static void test_attr(IHTMLElement *elem) IHTMLDOMAttribute_Release(attr); } +static void test_blocked(IHTMLDocument2 *doc, IHTMLElement *outer_elem) +{ + IHTMLElement *elem; + + test_elem_set_innerhtml((IUnknown*)outer_elem, + "<img id=\"imgid\" src=\"BLOCKED::http://www.winehq.org/img.png\" />"); + elem = get_elem_by_id(doc, "imgid", TRUE); + if(elem) { + test_img_src((IUnknown*)elem, "BLOCKED::", "blocked::http://www.winehq.org/img.png"); + IHTMLElement_Release(elem); + } + + test_elem_set_innerhtml((IUnknown*)outer_elem, + "<img id=\"imgid\" src=\"BLOCKE::http://www.winehq.org/img.png\" />"); + elem = get_elem_by_id(doc, "imgid", TRUE); + if(elem) { + test_img_src((IUnknown*)elem, "blocke::http://www.winehq.org/img.png", NULL); + test_img_set_src((IUnknown*)elem, "BLOCKED:http://www.winehq.org/img.png"); + test_img_src((IUnknown*)elem, "blocked:http://www.winehq.org/img.png", NULL); + test_img_set_src((IUnknown*)elem, "blocked::http://www.winehq.org/img.png"); + test_img_src((IUnknown*)elem, "BLOCKED::", "blocked::http://www.winehq.org/img.png"); + IHTMLElement_Release(elem); + } +} + static void test_elems2(IHTMLDocument2 *doc) { IHTMLElement *elem, *elem2, *div; @@ -6913,6 +6938,7 @@ static void test_elems2(IHTMLDocument2 *doc) test_attr(div); test_style_filters(div); + test_blocked(doc, div); IHTMLElement_Release(div); }

1 0

Ken Thomases : secur32: Extract schan_imp_allocate/ free_certificate_credentials functions.
by Alexandre Julliard March 14, 2011

March 14, 2011

Module: wine Branch: master Commit: 9124cdc2346a4ff37c072c4d4a9082d50a119138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9124cdc2346a4ff37c072c4d4… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 13 18:58:24 2011 -0500 secur32: Extract schan_imp_allocate/free_certificate_credentials functions. --- dlls/secur32/schannel.c | 30 +++++++++++++++++++++--------- 1 files changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index ff9a118..da19b36 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -73,6 +73,7 @@ MAKE_FUNCPTR(gnutls_transport_set_push_function); typedef struct schan_imp_session_opaque *schan_imp_session; +typedef struct schan_imp_certificate_credentials_opaque *schan_imp_certificate_credentials; struct schan_transport; @@ -116,7 +117,7 @@ static ssize_t schan_push_adapter(gnutls_transport_ptr_t transport, } static BOOL schan_imp_create_session(schan_imp_session *session, BOOL is_server, - gnutls_certificate_credentials cred) + schan_imp_certificate_credentials cred) { gnutls_session_t *s = (gnutls_session_t*)session; @@ -137,7 +138,8 @@ static BOOL schan_imp_create_session(schan_imp_session *session, BOOL is_server, return FALSE; } - err = pgnutls_credentials_set(*s, GNUTLS_CRD_CERTIFICATE, cred); + err = pgnutls_credentials_set(*s, GNUTLS_CRD_CERTIFICATE, + (gnutls_certificate_credentials)cred); if (err != GNUTLS_E_SUCCESS) { pgnutls_perror(err); @@ -376,6 +378,19 @@ static SECURITY_STATUS schan_imp_recv(schan_imp_session session, void *buffer, return SEC_E_OK; } +static BOOL schan_imp_allocate_certificate_credentials(schan_imp_certificate_credentials *c) +{ + int ret = pgnutls_certificate_allocate_credentials((gnutls_certificate_credentials*)c); + if (ret != GNUTLS_E_SUCCESS) + pgnutls_perror(ret); + return (ret == GNUTLS_E_SUCCESS); +} + +static void schan_imp_free_certificate_credentials(schan_imp_certificate_credentials c) +{ + pgnutls_certificate_free_credentials((gnutls_certificate_credentials)c); +} + #define SCHAN_INVALID_HANDLE ~0UL @@ -395,7 +410,7 @@ struct schan_handle struct schan_credentials { ULONG credential_use; - gnutls_certificate_credentials credentials; + schan_imp_certificate_credentials credentials; }; struct schan_context @@ -666,7 +681,6 @@ static SECURITY_STATUS schan_AcquireClientCredentials(const SCHANNEL_CRED *schan if (st == SEC_E_OK) { ULONG_PTR handle; - int ret; creds = HeapAlloc(GetProcessHeap(), 0, sizeof(*creds)); if (!creds) return SEC_E_INSUFFICIENT_MEMORY; @@ -675,10 +689,8 @@ static SECURITY_STATUS schan_AcquireClientCredentials(const SCHANNEL_CRED *schan if (handle == SCHAN_INVALID_HANDLE) goto fail; creds->credential_use = SECPKG_CRED_OUTBOUND; - ret = pgnutls_certificate_allocate_credentials(&creds->credentials); - if (ret != GNUTLS_E_SUCCESS) + if (!schan_imp_allocate_certificate_credentials(&creds->credentials)) { - pgnutls_perror(ret); schan_free_handle(handle, SCHAN_HANDLE_CRED); goto fail; } @@ -785,7 +797,7 @@ static SECURITY_STATUS SEC_ENTRY schan_FreeCredentialsHandle( if (!creds) return SEC_E_INVALID_HANDLE; if (creds->credential_use == SECPKG_CRED_OUTBOUND) - pgnutls_certificate_free_credentials(creds->credentials); + schan_imp_free_certificate_credentials(creds->credentials); HeapFree(GetProcessHeap(), 0, creds); return SEC_E_OK; @@ -1713,7 +1725,7 @@ void SECUR32_deinitSchannelSP(void) { struct schan_credentials *cred; cred = schan_free_handle(i, SCHAN_HANDLE_CRED); - pgnutls_certificate_free_credentials(cred->credentials); + schan_imp_free_certificate_credentials(cred->credentials); HeapFree(GetProcessHeap(), 0, cred); } }

1 0

Ken Thomases : secur32: Extract schan_imp_create/dispose_session functions.
by Alexandre Julliard March 14, 2011

March 14, 2011

Module: wine Branch: master Commit: aeefb8188d3283b49329689c5c9083f7fb8a4c47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aeefb8188d3283b49329689c5… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 13 18:57:57 2011 -0500 secur32: Extract schan_imp_create/dispose_session functions. --- dlls/secur32/schannel.c | 48 ++++++++++++++++++++++++++++++---------------- 1 files changed, 31 insertions(+), 17 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 794f36b..d97d2f6 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -75,6 +75,33 @@ MAKE_FUNCPTR(gnutls_transport_set_push_function); struct schan_transport; +static BOOL schan_imp_create_session(gnutls_session_t *s, BOOL is_server) +{ + int err = pgnutls_init(s, is_server ? GNUTLS_SERVER : GNUTLS_CLIENT); + if (err != GNUTLS_E_SUCCESS) + { + pgnutls_perror(err); + return FALSE; + } + + /* FIXME: We should be using the information from the credentials here. */ + FIXME("Using hardcoded \"NORMAL\" priority\n"); + err = pgnutls_set_default_priority(*s); + if (err != GNUTLS_E_SUCCESS) + { + pgnutls_perror(err); + pgnutls_deinit(*s); + return FALSE; + } + + return TRUE; +} + +static void schan_imp_dispose_session(gnutls_session_t s) +{ + pgnutls_deinit(s); +} + static void schan_imp_set_session_transport(gnutls_session_t s, struct schan_transport *t) { @@ -939,31 +966,18 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( return SEC_E_INTERNAL_ERROR; } - err = pgnutls_init(&ctx->session, GNUTLS_CLIENT); - if (err != GNUTLS_E_SUCCESS) + if (!schan_imp_create_session(&ctx->session, FALSE)) { - pgnutls_perror(err); schan_free_handle(handle, SCHAN_HANDLE_CTX); HeapFree(GetProcessHeap(), 0, ctx); return SEC_E_INTERNAL_ERROR; } - /* FIXME: We should be using the information from the credentials here. */ - FIXME("Using hardcoded \"NORMAL\" priority\n"); - err = pgnutls_set_default_priority(ctx->session); - if (err != GNUTLS_E_SUCCESS) - { - pgnutls_perror(err); - pgnutls_deinit(ctx->session); - schan_free_handle(handle, SCHAN_HANDLE_CTX); - HeapFree(GetProcessHeap(), 0, ctx); - } - err = pgnutls_credentials_set(ctx->session, GNUTLS_CRD_CERTIFICATE, cred->credentials); if (err != GNUTLS_E_SUCCESS) { pgnutls_perror(err); - pgnutls_deinit(ctx->session); + schan_imp_dispose_session(ctx->session); schan_free_handle(handle, SCHAN_HANDLE_CTX); HeapFree(GetProcessHeap(), 0, ctx); } @@ -1401,7 +1415,7 @@ static SECURITY_STATUS SEC_ENTRY schan_DeleteSecurityContext(PCtxtHandle context ctx = schan_free_handle(context_handle->dwLower, SCHAN_HANDLE_CTX); if (!ctx) return SEC_E_INVALID_HANDLE; - pgnutls_deinit(ctx->session); + schan_imp_dispose_session(ctx->session); HeapFree(GetProcessHeap(), 0, ctx); return SEC_E_OK; @@ -1601,7 +1615,7 @@ void SECUR32_deinitSchannelSP(void) if (schan_handle_table[i].type == SCHAN_HANDLE_CTX) { struct schan_context *ctx = schan_free_handle(i, SCHAN_HANDLE_CTX); - pgnutls_deinit(ctx->session); + schan_imp_dispose_session(ctx->session); HeapFree(GetProcessHeap(), 0, ctx); } }

1 0

Ken Thomases : secur32: Extract GnuTLS-isms from schan_pull to schan_pull_adapter.
by Alexandre Julliard March 14, 2011

March 14, 2011

Module: wine Branch: master Commit: 194aaef7cd78ff9f5980abc385c508cdb410d039 URL: http://source.winehq.org/git/wine.git/?a=commit;h=194aaef7cd78ff9f5980abc38… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 13 18:58:00 2011 -0500 secur32: Extract GnuTLS-isms from schan_pull to schan_pull_adapter. --- dlls/secur32/schannel.c | 82 +++++++++++++++++++++++++++++++++++----------- 1 files changed, 62 insertions(+), 20 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index d97d2f6..9a6864f 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -75,6 +75,27 @@ MAKE_FUNCPTR(gnutls_transport_set_push_function); struct schan_transport; +static int schan_pull(struct schan_transport *t, void *buff, size_t *buff_len); + +static gnutls_session_t schan_session_for_transport(struct schan_transport* t); + + +static ssize_t schan_pull_adapter(gnutls_transport_ptr_t transport, + void *buff, size_t buff_len) +{ + struct schan_transport *t = (struct schan_transport*)transport; + gnutls_session_t s = schan_session_for_transport(t); + + int ret = schan_pull(transport, buff, &buff_len); + if (ret) + { + pgnutls_transport_set_errno(s, ret); + return -1; + } + + return buff_len; +} + static BOOL schan_imp_create_session(gnutls_session_t *s, BOOL is_server) { int err = pgnutls_init(s, is_server ? GNUTLS_SERVER : GNUTLS_CLIENT); @@ -827,36 +848,52 @@ static char *schan_get_buffer(const struct schan_transport *t, struct schan_buff return (char *)buffer->pvBuffer + s->offset; } -static ssize_t schan_pull(gnutls_transport_ptr_t transport, void *buff, size_t buff_len) +/* 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. + * EAGAIN when no data could be read without blocking + * another errno-style error value on failure + * + */ +static int schan_pull(struct schan_transport *t, void *buff, size_t *buff_len) { - struct schan_transport *t = transport; char *b; + size_t local_len = *buff_len; + + TRACE("Pull %zu bytes\n", local_len); - TRACE("Pull %zu bytes\n", buff_len); + *buff_len = 0; - b = schan_get_buffer(t, &t->in, &buff_len); + b = schan_get_buffer(t, &t->in, &local_len); if (!b) - { - pgnutls_transport_set_errno(t->ctx->session, EAGAIN); - return -1; - } + return EAGAIN; - if (t->in.limit != 0 && t->in.offset + buff_len >= t->in.limit) + if (t->in.limit != 0 && t->in.offset + local_len >= t->in.limit) { - buff_len = t->in.limit - t->in.offset; - if (buff_len == 0) - { - pgnutls_transport_set_errno(t->ctx->session, EAGAIN); - return -1; - } + local_len = t->in.limit - t->in.offset; + if (local_len == 0) + return EAGAIN; } - memcpy(buff, b, buff_len); - t->in.offset += buff_len; + memcpy(buff, b, local_len); + t->in.offset += local_len; - TRACE("Read %zu bytes\n", buff_len); + TRACE("Read %zu bytes\n", local_len); - return buff_len; + *buff_len = local_len; + return 0; } static ssize_t schan_push(gnutls_transport_ptr_t transport, const void *buff, size_t buff_len) @@ -881,6 +918,11 @@ static ssize_t schan_push(gnutls_transport_ptr_t transport, const void *buff, si return buff_len; } +static gnutls_session_t schan_session_for_transport(struct schan_transport* t) +{ + return t->ctx->session; +} + static int schan_init_sec_ctx_get_next_buffer(const struct schan_transport *t, struct schan_buffers *s) { if (s->current_buffer_idx == -1) @@ -982,7 +1024,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( HeapFree(GetProcessHeap(), 0, ctx); } - pgnutls_transport_set_pull_function(ctx->session, schan_pull); + pgnutls_transport_set_pull_function(ctx->session, schan_pull_adapter); pgnutls_transport_set_push_function(ctx->session, schan_push); phNewContext->dwLower = handle;

1 0

Ken Thomases : secur32: Extract GnuTLS-isms from schan_push to schan_push_adapter.
by Alexandre Julliard March 14, 2011

March 14, 2011

Module: wine Branch: master Commit: c86dafe51e7032462b1be9ee9160972d9fff78f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c86dafe51e7032462b1be9ee9… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 13 18:58:03 2011 -0500 secur32: Extract GnuTLS-isms from schan_push to schan_push_adapter. --- dlls/secur32/schannel.c | 60 ++++++++++++++++++++++++++++++++++++---------- 1 files changed, 47 insertions(+), 13 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 9a6864f..5404d90 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -76,6 +76,7 @@ struct schan_transport; static int schan_pull(struct schan_transport *t, void *buff, size_t *buff_len); +static int schan_push(struct schan_transport *t, const void *buff, size_t *buff_len); static gnutls_session_t schan_session_for_transport(struct schan_transport* t); @@ -96,6 +97,22 @@ static ssize_t schan_pull_adapter(gnutls_transport_ptr_t transport, return buff_len; } +static ssize_t schan_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 = schan_session_for_transport(t); + + int ret = schan_push(transport, buff, &buff_len); + if (ret) + { + pgnutls_transport_set_errno(s, ret); + return -1; + } + + return buff_len; +} + static BOOL schan_imp_create_session(gnutls_session_t *s, BOOL is_server) { int err = pgnutls_init(s, is_server ? GNUTLS_SERVER : GNUTLS_CLIENT); @@ -896,26 +913,43 @@ static int schan_pull(struct schan_transport *t, void *buff, size_t *buff_len) return 0; } -static ssize_t schan_push(gnutls_transport_ptr_t transport, const void *buff, size_t buff_len) +/* 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. + * EAGAIN when no data could be written without blocking + * another errno-style error value on failure + * + */ +static int schan_push(struct schan_transport *t, const void *buff, size_t *buff_len) { - struct schan_transport *t = transport; char *b; + size_t local_len = *buff_len; - TRACE("Push %zu bytes\n", buff_len); + TRACE("Push %zu bytes\n", local_len); + + *buff_len = 0; - b = schan_get_buffer(t, &t->out, &buff_len); + b = schan_get_buffer(t, &t->out, &local_len); if (!b) - { - pgnutls_transport_set_errno(t->ctx->session, EAGAIN); - return -1; - } + return EAGAIN; - memcpy(b, buff, buff_len); - t->out.offset += buff_len; + memcpy(b, buff, local_len); + t->out.offset += local_len; - TRACE("Wrote %zu bytes\n", buff_len); + TRACE("Wrote %zu bytes\n", local_len); - return buff_len; + *buff_len = local_len; + return 0; } static gnutls_session_t schan_session_for_transport(struct schan_transport* t) @@ -1025,7 +1059,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( } pgnutls_transport_set_pull_function(ctx->session, schan_pull_adapter); - pgnutls_transport_set_push_function(ctx->session, schan_push); + pgnutls_transport_set_push_function(ctx->session, schan_push_adapter); phNewContext->dwLower = handle; phNewContext->dwUpper = 0;

1 0

Ken Thomases : secur32: Set session credentials in schan_imp_create_session .
by Alexandre Julliard March 14, 2011

March 14, 2011

Module: wine Branch: master Commit: 6b5f7df5cb8997c5ac5e59854812a907795bc8ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b5f7df5cb8997c5ac5e59854… Author: Ken Thomases <ken(a)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)

1 0

Ken Thomases : secur32: Use opaque type schan_imp_session in schan_imp interface.
by Alexandre Julliard March 14, 2011

March 14, 2011

Module: wine Branch: master Commit: e02ac5f023ada68ae62414b0a89e67df4999b493 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e02ac5f023ada68ae62414b0a… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 13 18:58:18 2011 -0500 secur32: Use opaque type schan_imp_session in schan_imp interface. --- dlls/secur32/schannel.c | 40 ++++++++++++++++++++++++++-------------- 1 files changed, 26 insertions(+), 14 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index f7e05be..ff9a118 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -72,20 +72,22 @@ MAKE_FUNCPTR(gnutls_transport_set_push_function); #undef MAKE_FUNCPTR +typedef struct schan_imp_session_opaque *schan_imp_session; + struct schan_transport; static int schan_pull(struct schan_transport *t, void *buff, size_t *buff_len); static int schan_push(struct schan_transport *t, const void *buff, size_t *buff_len); -static gnutls_session_t schan_session_for_transport(struct schan_transport* t); +static schan_imp_session schan_session_for_transport(struct schan_transport* t); static ssize_t schan_pull_adapter(gnutls_transport_ptr_t transport, void *buff, size_t buff_len) { struct schan_transport *t = (struct schan_transport*)transport; - gnutls_session_t s = schan_session_for_transport(t); + gnutls_session_t s = (gnutls_session_t)schan_session_for_transport(t); int ret = schan_pull(transport, buff, &buff_len); if (ret) @@ -101,7 +103,7 @@ static ssize_t schan_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 = schan_session_for_transport(t); + gnutls_session_t s = (gnutls_session_t)schan_session_for_transport(t); int ret = schan_push(transport, buff, &buff_len); if (ret) @@ -113,9 +115,11 @@ 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(schan_imp_session *session, BOOL is_server, gnutls_certificate_credentials cred) { + gnutls_session_t *s = (gnutls_session_t*)session; + int err = pgnutls_init(s, is_server ? GNUTLS_SERVER : GNUTLS_CLIENT); if (err != GNUTLS_E_SUCCESS) { @@ -147,19 +151,22 @@ static BOOL schan_imp_create_session(gnutls_session_t *s, BOOL is_server, return TRUE; } -static void schan_imp_dispose_session(gnutls_session_t s) +static void schan_imp_dispose_session(schan_imp_session session) { + gnutls_session_t s = (gnutls_session_t)session; pgnutls_deinit(s); } -static void schan_imp_set_session_transport(gnutls_session_t s, +static void schan_imp_set_session_transport(schan_imp_session session, struct schan_transport *t) { + gnutls_session_t s = (gnutls_session_t)session; pgnutls_transport_set_ptr(s, (gnutls_transport_ptr_t)t); } -static SECURITY_STATUS schan_imp_handshake(gnutls_session_t s) +static SECURITY_STATUS schan_imp_handshake(schan_imp_session session) { + gnutls_session_t s = (gnutls_session_t)session; int err = pgnutls_handshake(s); switch(err) { @@ -285,15 +292,17 @@ static ALG_ID schannel_get_kx_algid(gnutls_kx_algorithm_t kx) } } -static unsigned int schan_imp_get_session_cipher_block_size(gnutls_session_t s) +static unsigned int schan_imp_get_session_cipher_block_size(schan_imp_session session) { + gnutls_session_t s = (gnutls_session_t)session; gnutls_cipher_algorithm_t cipher = pgnutls_cipher_get(s); return schannel_get_cipher_block_size(cipher); } -static SECURITY_STATUS schan_imp_get_connection_info(gnutls_session_t s, +static SECURITY_STATUS schan_imp_get_connection_info(schan_imp_session session, SecPkgContext_ConnectionInfo *info) { + gnutls_session_t s = (gnutls_session_t)session; gnutls_protocol_t proto = pgnutls_protocol_get_version(s); gnutls_cipher_algorithm_t alg = pgnutls_cipher_get(s); gnutls_mac_algorithm_t mac = pgnutls_mac_get(s); @@ -310,9 +319,10 @@ static SECURITY_STATUS schan_imp_get_connection_info(gnutls_session_t s, return SEC_E_OK; } -static SECURITY_STATUS schan_imp_get_session_peer_certificate(gnutls_session_t s, +static SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session, PCCERT_CONTEXT *cert) { + gnutls_session_t s = (gnutls_session_t)session; unsigned int list_size; const gnutls_datum_t *datum; @@ -330,9 +340,10 @@ static SECURITY_STATUS schan_imp_get_session_peer_certificate(gnutls_session_t s return SEC_E_INTERNAL_ERROR; } -static SECURITY_STATUS schan_imp_send(gnutls_session_t s, const void *buffer, +static SECURITY_STATUS schan_imp_send(schan_imp_session session, const void *buffer, size_t *length) { + gnutls_session_t s = (gnutls_session_t)session; ssize_t ret = pgnutls_record_send(s, buffer, *length); if (ret >= 0) *length = ret; @@ -347,9 +358,10 @@ static SECURITY_STATUS schan_imp_send(gnutls_session_t s, const void *buffer, return SEC_E_OK; } -static SECURITY_STATUS schan_imp_recv(gnutls_session_t s, void *buffer, +static SECURITY_STATUS schan_imp_recv(schan_imp_session session, void *buffer, size_t *length) { + gnutls_session_t s = (gnutls_session_t)session; ssize_t ret = pgnutls_record_recv(s, buffer, *length); if (ret >= 0) *length = ret; @@ -388,7 +400,7 @@ struct schan_credentials struct schan_context { - gnutls_session_t session; + schan_imp_session session; ULONG req_ctx_attr; }; @@ -964,7 +976,7 @@ static int schan_push(struct schan_transport *t, const void *buff, size_t *buff_ return 0; } -static gnutls_session_t schan_session_for_transport(struct schan_transport* t) +static schan_imp_session schan_session_for_transport(struct schan_transport* t) { return t->ctx->session; }

1 0