April 2013 - Wine-Commits - list.winehq.org

André Hentschel : winelib: Use winecfg to set a DllOverride.
by Alexandre Julliard April 4, 2013

April 4, 2013

Module: docs Branch: master Commit: 50b65515fd7f8c42bd046450413d66f9ec5ee8d1 URL: http://source.winehq.org/git/docs.git/?a=commit;h=50b65515fd7f8c42bd0464504… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Apr 4 02:44:49 2013 +0200 winelib: Use winecfg to set a DllOverride. --- en/winelib-bindlls.sgml | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/en/winelib-bindlls.sgml b/en/winelib-bindlls.sgml index 54fb63a..f978780 100644 --- a/en/winelib-bindlls.sgml +++ b/en/winelib-bindlls.sgml @@ -255,13 +255,8 @@ signed short WINAPI MyProxyWinFunc (unsigned short a, void *b, void *c, If you have both a Windows DLL and a Linux DLL/proxy pair then you will have to ensure that the correct one gets called. The easiest way is probably simply to rename the windows version so that it doesn't get - detected. Alternatively you could specify in the DllOverrides section - (or the AppDefaults\\myprog.exe\\DllOverrides section) of the config - file (in your .wine directory) that the built-in version be used. Note - that if the Windows version Dll is present and is in the same - directory as the executable (as opposed to being in the Windows - directory) then you will currently need to specify the whole path to - the dll, not merely its name. + detected. Alternatively you could set a DLL override with winecfg, + so that the built-in version is used. </para> <para> Once you have done this you should be using the Linux Shared Object

1 0

Francois Gouget : testbot/Users: Add a 'Reject' button for accounts waiting for approval.
by Alexandre Julliard April 4, 2013

April 4, 2013

Module: tools Branch: master Commit: e92578b7804177c3af9b9954781eb685d3c8bcc8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e92578b7804177c3af9b9954… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 4 12:29:44 2013 +0200 testbot/Users: Add a 'Reject' button for accounts waiting for approval. --- testbot/README | 4 ++-- testbot/web/admin/UserDetails.pl | 20 +++++++++++++++++++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/testbot/README b/testbot/README index 7ddaba9..3977c5d 100644 --- a/testbot/README +++ b/testbot/README @@ -78,8 +78,8 @@ but has to be 'activated' before it can be used. Also an email is sent to the WineTestBot administrators. If the request is considered to be illegitimate / spam, the administrator -should directly delete the provisional account. Otherwise the account should -be approved. +should directly delete / reject the provisional account. Otherwise the account +should be approved. Approving the account will generate a 'password reset code' and send an email to the user with a URL to visit to set the account password. That will activate diff --git a/testbot/web/admin/UserDetails.pl b/testbot/web/admin/UserDetails.pl index f9c1bea..faf8bbd 100644 --- a/testbot/web/admin/UserDetails.pl +++ b/testbot/web/admin/UserDetails.pl @@ -57,7 +57,8 @@ sub GetActions my @Actions; if (!defined $LDAPServer and $self->{Item}->WaitingForApproval()) { - $Actions[0] = "Approve"; + push @Actions, "Approve"; + push @Actions, "Reject" if ($self->{Item}->Name); } push(@Actions, @{$self->SUPER::GetActions()}); @@ -76,6 +77,19 @@ sub OnApprove($) exit; } +sub OnReject($) +{ + my $self = shift; + + $self->{Item}->Status('deleted'); + ($self->{ErrField}, $self->{ErrMessage}) = $self->{Item}->Save(); + return !1 if (defined $self->{ErrMessage}); + # Forcefully log out that user by deleting his web sessions + DeleteSessions($self->{Item}); + $self->RedirectToList(); + exit; +} + sub OnOK($) { my $self = shift; @@ -99,6 +113,10 @@ sub OnAction { return $self->OnApprove(); } + elsif ($Action eq "Reject") + { + return $self->OnReject(); + } elsif ($Action eq "OK") { return $self->OnOK();

1 0

Francois Gouget : testbot/Users: Forcefully log out the user as soon as the account is disabled or deleted.
by Alexandre Julliard April 4, 2013

April 4, 2013

Module: tools Branch: master Commit: 77129d2e16eaa902fcbb86a09bbd00d63634a053 URL: http://source.winehq.org/git/tools.git/?a=commit;h=77129d2e16eaa902fcbb86a0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 4 12:14:34 2013 +0200 testbot/Users: Forcefully log out the user as soon as the account is disabled or deleted. Still delete any left-over session in Janitor.pl just in case. --- testbot/web/admin/UserDetails.pl | 19 +++++++++++++++++++ testbot/web/admin/UsersList.pl | 29 +++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 0 deletions(-) diff --git a/testbot/web/admin/UserDetails.pl b/testbot/web/admin/UserDetails.pl index bc56eec..f9c1bea 100644 --- a/testbot/web/admin/UserDetails.pl +++ b/testbot/web/admin/UserDetails.pl @@ -22,6 +22,7 @@ use strict; package UserDetailsPage; use ObjectModel::CGI::ItemPage; +use WineTestBot::CGI::Sessions; use WineTestBot::Config; use WineTestBot::Users; @@ -75,6 +76,20 @@ sub OnApprove($) exit; } +sub OnOK($) +{ + my $self = shift; + + return !1 if (!$self->Save()); + if ($self->{Item}->Status ne 'active') + { + # Forcefully log out that user by deleting his web sessions + DeleteSessions($self->{Item}); + } + $self->RedirectToList(); + exit; +} + sub OnAction { my $self = shift; @@ -84,6 +99,10 @@ sub OnAction { return $self->OnApprove(); } + elsif ($Action eq "OK") + { + return $self->OnOK(); + } return $self->SUPER::OnAction(@_); } diff --git a/testbot/web/admin/UsersList.pl b/testbot/web/admin/UsersList.pl index 4971f99..5148394 100644 --- a/testbot/web/admin/UsersList.pl +++ b/testbot/web/admin/UsersList.pl @@ -23,6 +23,7 @@ package UsersListPage; use ObjectModel::PropertyDescriptor; use ObjectModel::CGI::CollectionPage; +use WineTestBot::CGI::Sessions; use WineTestBot::Config; use WineTestBot::Users; @@ -69,6 +70,34 @@ sub GetActions return $self->SUPER::GetActions(@_); } +sub OnAction +{ + my $self = shift; + my ($CollectionBlock, $Action) = @_; + + if ($Action eq "Delete") + { + foreach my $UserName (@{$self->{Collection}->GetKeys()}) + { + next if (!defined $self->GetParam($CollectionBlock->SelName($UserName))); + my $User = $self->{Collection}->GetItem($UserName); + $User->Status('deleted'); + my ($ErrProperty, $ErrMessage) = $User->Save(); + if (defined $ErrMessage) + { + $self->{ErrMessage} = $ErrMessage; + return !1; + } + # Forcefully log out that user by deleting his web sessions + DeleteSessions($User); + } + return 1; + } + + return $self->SUPER::OnAction(@_); +} + + package main; my $Request = shift;

1 0

Francois Gouget : testbot/Users: Fix the deletion of user accounts.
by Alexandre Julliard April 4, 2013

April 4, 2013

Module: tools Branch: master Commit: 2411c853ce53830a32569c22a3b7ec4f08e094b3 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2411c853ce53830a32569c22… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 4 12:14:10 2013 +0200 testbot/Users: Fix the deletion of user accounts. Users cannot be deleted directly because the Jobs table hold references to them. So mark the accounts as deleted and let the Janitor.pl script delete them when they are not referenced anymore. To do so, transform the 'Active' boolean field into a 'Status' enumeration that can be 'active' (previously Active=Y), 'disabled' (Active=N) or 'deleted'. The Sessions table also contains references to the Users, but these should be deleted together with the user account, which will forcefully log out the user as a side effect. --- testbot/README | 4 +- testbot/bin/Janitor.pl | 63 +++++++++++++++++++++++++------ testbot/ddl/update25.sql | 17 ++++++++ testbot/ddl/winetestbot.sql | 6 +- testbot/doc/winetestbot-schema.dia | 4 +- testbot/lib/WineTestBot/CGI/Sessions.pm | 11 +++++- testbot/lib/WineTestBot/Users.pm | 17 ++++---- testbot/web/Register.pl | 2 +- testbot/web/admin/UsersList.pl | 4 +- 9 files changed, 98 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=2411c853ce53830a3256…

1 0

Piotr Caban : msvcp: Change architecture of more thiscall functions.
by Alexandre Julliard April 3, 2013

April 3, 2013

Module: wine Branch: master Commit: 1f2aceb5beff2804c06d665677f5929e57fd4f59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f2aceb5beff2804c06d66567… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 3 16:23:00 2013 +0200 msvcp: Change architecture of more thiscall functions. --- dlls/msvcp100/msvcp100.spec | 64 +++++++++++++++++++++--------------------- dlls/msvcp90/msvcp90.spec | 52 +++++++++++++++++----------------- 2 files changed, 58 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f2aceb5beff2804c06d6…

1 0

André Hentschel : kernel32/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard April 3, 2013

April 3, 2013

Module: wine Branch: master Commit: b815548cf07a343fae3afa470ef669de86c8f6e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b815548cf07a343fae3afa470… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 3 17:26:22 2013 +0200 kernel32/tests: Don't test function directly when reporting GetLastError(). --- dlls/msvcrt/tests/locale.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 257e3c8..63f8a59 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -713,8 +713,9 @@ static void test__Gettnames(void) ok(!strcmp(ret->str[39], "PM"), "ret->str[39] = %s\n", ret->str[39]); ok(!strcmp(ret->str[40], "M/d/yyyy") || broken(!strcmp(ret->str[40], "M/d/yy"))/*NT*/, "ret->str[40] = %s\n", ret->str[40]); - ok(GetLocaleInfoA(MAKELCID(LANG_ENGLISH, SORT_DEFAULT), LOCALE_SLONGDATE|LOCALE_NOUSEROVERRIDE, - buf, sizeof(buf)) != 0, "GetLocaleInfo failed: %x\n", GetLastError()); + size = GetLocaleInfoA(MAKELCID(LANG_ENGLISH, SORT_DEFAULT), + LOCALE_SLONGDATE|LOCALE_NOUSEROVERRIDE, buf, sizeof(buf)); + ok(size, "GetLocaleInfo failed: %x\n", GetLastError()); ok(!strcmp(ret->str[41], buf), "ret->str[41] = %s, expected %s\n", ret->str[41], buf); free(ret);

1 0

Francois Gouget : windowscodecs/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard April 3, 2013

April 3, 2013

Module: wine Branch: master Commit: b84d91dfecfd5ecd2438a99cde874934efe21616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b84d91dfecfd5ecd2438a99cd… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 3 16:07:10 2013 +0200 windowscodecs/tests: Add a trailing '\n' to an ok() call. --- dlls/windowscodecs/tests/converter.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index a551fde..5b8f6e4 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -550,7 +550,7 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls ok(SUCCEEDED(hr), "CreateFrame failed, hr=%x\n", hr); if (SUCCEEDED(hr)) { - ok(options != NULL, "Encoder initialization has not created an property bag"); + ok(options != NULL, "Encoder initialization has not created an property bag\n"); if(options) test_encoder_properties(clsid_encoder, options);

1 0

Jacek Caban : wininet: Use schannel for HTTPS connection by defaul and get rid of OpenSSL dependency .
by Alexandre Julliard April 3, 2013

April 3, 2013

Module: wine Branch: master Commit: cde372700c8c1fc66f727c66d1852d33aaa70794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cde372700c8c1fc66f727c66d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 3 14:05:51 2013 +0200 wininet: Use schannel for HTTPS connection by defaul and get rid of OpenSSL dependency. --- dlls/wininet/internet.h | 1 - dlls/wininet/netconnection.c | 534 +----------------------------------------- dlls/wininet/tests/http.c | 1 - 3 files changed, 2 insertions(+), 534 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cde372700c8c1fc66f727…

1 0

Jacek Caban : wininet: Use schannel in NETCON_GetCipherStrength if OpenSSL is not available.
by Alexandre Julliard April 3, 2013

April 3, 2013

Module: wine Branch: master Commit: d473803765d6813a14f039d2bb576c406b51fccb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d473803765d6813a14f039d2b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 3 14:03:24 2013 +0200 wininet: Use schannel in NETCON_GetCipherStrength if OpenSSL is not available. --- dlls/wininet/netconnection.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index e896d84..cc16950 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -1299,8 +1299,16 @@ int NETCON_GetCipherStrength(netconn_t *connection) pSSL_CIPHER_get_bits(cipher, &bits); return bits; #else - FIXME("not supported on this platform\n"); - return 0; + SecPkgContext_ConnectionInfo conn_info; + SECURITY_STATUS res; + + if (!connection->secure) + return 0; + + res = QueryContextAttributesW(&connection->ssl_ctx, SECPKG_ATTR_CONNECTION_INFO, (void*)&conn_info); + if(res != SEC_E_OK) + WARN("QueryContextAttributesW failed: %08x\n", res); + return res == SEC_E_OK ? conn_info.dwCipherStrength : 0; #endif }

1 0

Jacek Caban : wininet: Use schannel in NETCON_secure_connect if OpenSSL is not available.
by Alexandre Julliard April 3, 2013

April 3, 2013

Module: wine Branch: master Commit: 952588eac43244871c22e769e7027636ca45d932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=952588eac43244871c22e769e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 3 14:03:13 2013 +0200 wininet: Use schannel in NETCON_secure_connect if OpenSSL is not available. --- dlls/wininet/internet.h | 5 + dlls/wininet/netconnection.c | 206 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 208 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index c423fb6..9fbb74f 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -92,7 +92,12 @@ typedef struct int socket; BOOL secure; void *ssl_s; + CtxtHandle ssl_ctx; + SecPkgContext_StreamSizes ssl_sizes; server_t *server; + char *ssl_buf; + char *extra_buf; + size_t extra_len; DWORD security_flags; BOOL mask_errors; diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 17518b9..e896d84 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -214,6 +214,7 @@ static PCCERT_CONTEXT X509_to_cert_context(X509 *cert) return ret; } +#endif /* SONAME_LIBSSL */ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTORE store) { @@ -372,6 +373,7 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR return ERROR_SUCCESS; } +#ifdef SONAME_LIBSSL static int netconn_secure_verify(int preverify_ok, X509_STORE_CTX *ctx) { SSL *ssl; @@ -603,6 +605,55 @@ static DWORD init_openssl(void) return ERROR_INTERNET_SECURITY_CHANNEL_ERROR; #endif } +#else + +static SecHandle cred_handle, compat_cred_handle; +static BOOL cred_handle_initialized, have_compat_cred_handle; + +static CRITICAL_SECTION init_sechandle_cs; +static CRITICAL_SECTION_DEBUG init_sechandle_cs_debug = { + 0, 0, &init_sechandle_cs, + { &init_sechandle_cs_debug.ProcessLocksList, + &init_sechandle_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": init_sechandle_cs") } +}; +static CRITICAL_SECTION init_sechandle_cs = { &init_sechandle_cs_debug, -1, 0, 0, 0, 0 }; + +static BOOL ensure_cred_handle(void) +{ + SECURITY_STATUS res = SEC_E_OK; + + EnterCriticalSection(&init_sechandle_cs); + + if(!cred_handle_initialized) { + SCHANNEL_CRED cred = {SCHANNEL_CRED_VERSION}; + SecPkgCred_SupportedProtocols prots; + + res = AcquireCredentialsHandleW(NULL, (WCHAR*)UNISP_NAME_W, SECPKG_CRED_OUTBOUND, NULL, &cred, + NULL, NULL, &cred_handle, NULL); + if(res == SEC_E_OK) { + res = QueryCredentialsAttributesA(&cred_handle, SECPKG_ATTR_SUPPORTED_PROTOCOLS, &prots); + if(res != SEC_E_OK || (prots.grbitProtocol & SP_PROT_TLS1_1PLUS_CLIENT)) { + cred.grbitEnabledProtocols = prots.grbitProtocol & ~SP_PROT_TLS1_1PLUS_CLIENT; + res = AcquireCredentialsHandleW(NULL, (WCHAR*)UNISP_NAME_W, SECPKG_CRED_OUTBOUND, NULL, &cred, + NULL, NULL, &compat_cred_handle, NULL); + have_compat_cred_handle = res == SEC_E_OK; + } + } + + cred_handle_initialized = res == SEC_E_OK; + } + + LeaveCriticalSection(&init_sechandle_cs); + + if(res != SEC_E_OK) { + WARN("Failed: %08x\n", res); + return FALSE; + } + + return TRUE; +} + #endif /* SONAME_LIBSSL */ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD timeout) @@ -707,6 +758,10 @@ void free_netconn(netconn_t *netconn) #ifdef SONAME_LIBSSL pSSL_shutdown(netconn->ssl_s); pSSL_free(netconn->ssl_s); +#else + heap_free(netconn->ssl_buf); + netconn->ssl_buf = NULL; + DeleteSecurityContext(&netconn->ssl_ctx); #endif } @@ -738,6 +793,12 @@ void NETCON_unload(void) } heap_free(ssl_locks); } +#else + if(cred_handle_initialized) + FreeCredentialsHandle(&cred_handle); + if(have_compat_cred_handle) + FreeCredentialsHandle(&compat_cred_handle); + DeleteCriticalSection(&init_sechandle_cs); #endif } @@ -861,6 +922,147 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode } connection->ssl_s = ssl_s; +#else + SecBuffer out_buf = {0, SECBUFFER_TOKEN, NULL}, in_bufs[2] = {{0, SECBUFFER_TOKEN}, {0, SECBUFFER_EMPTY}}; + SecBufferDesc out_desc = {SECBUFFER_VERSION, 1, &out_buf}, in_desc = {SECBUFFER_VERSION, 2, in_bufs}; + SecHandle *cred = &cred_handle; + BYTE *read_buf; + SIZE_T read_buf_size = 2048; + ULONG attrs = 0; + CtxtHandle ctx; + SSIZE_T size; + int bits; + const CERT_CONTEXT *cert; + SECURITY_STATUS status; + DWORD res = ERROR_SUCCESS; + + const DWORD isc_req_flags = ISC_REQ_ALLOCATE_MEMORY|ISC_REQ_USE_SESSION_KEY|ISC_REQ_CONFIDENTIALITY + |ISC_REQ_SEQUENCE_DETECT|ISC_REQ_REPLAY_DETECT|ISC_REQ_MANUAL_CRED_VALIDATION; + + if(!ensure_cred_handle()) + return FALSE; + + if(compat_mode) { + if(!have_compat_cred_handle) + return ERROR_INTERNET_SECURITY_CHANNEL_ERROR; + cred = &compat_cred_handle; + } + + read_buf = heap_alloc(read_buf_size); + if(!read_buf) + return ERROR_OUTOFMEMORY; + + status = InitializeSecurityContextW(cred, NULL, connection->server->name, isc_req_flags, 0, 0, NULL, 0, + &ctx, &out_desc, &attrs, NULL); + + assert(status != SEC_E_OK); + + while(status == SEC_I_CONTINUE_NEEDED || status == SEC_E_INCOMPLETE_MESSAGE) { + if(out_buf.cbBuffer) { + assert(status == SEC_I_CONTINUE_NEEDED); + + TRACE("sending %u bytes\n", out_buf.cbBuffer); + + size = send(connection->socket, out_buf.pvBuffer, out_buf.cbBuffer, 0); + if(size != out_buf.cbBuffer) { + ERR("send failed\n"); + status = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; + break; + } + + FreeContextBuffer(out_buf.pvBuffer); + out_buf.pvBuffer = NULL; + out_buf.cbBuffer = 0; + } + + if(status == SEC_I_CONTINUE_NEEDED) { + assert(in_bufs[1].cbBuffer < read_buf_size); + + memmove(read_buf, (BYTE*)in_bufs[0].pvBuffer+in_bufs[0].cbBuffer-in_bufs[1].cbBuffer, in_bufs[1].cbBuffer); + in_bufs[0].cbBuffer = in_bufs[1].cbBuffer; + + in_bufs[1].BufferType = SECBUFFER_EMPTY; + in_bufs[1].cbBuffer = 0; + in_bufs[1].pvBuffer = NULL; + } + + assert(in_bufs[0].BufferType == SECBUFFER_TOKEN); + assert(in_bufs[1].BufferType == SECBUFFER_EMPTY); + + if(in_bufs[0].cbBuffer + 1024 > read_buf_size) { + BYTE *new_read_buf; + + new_read_buf = heap_realloc(read_buf, read_buf_size + 1024); + if(!new_read_buf) { + status = E_OUTOFMEMORY; + break; + } + + in_bufs[0].pvBuffer = read_buf = new_read_buf; + read_buf_size += 1024; + } + + size = recv(connection->socket, read_buf+in_bufs[0].cbBuffer, read_buf_size-in_bufs[0].cbBuffer, 0); + if(size < 1) { + WARN("recv error\n"); + res = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; + break; + } + + TRACE("recv %lu bytes\n", size); + + in_bufs[0].cbBuffer += size; + in_bufs[0].pvBuffer = read_buf; + status = InitializeSecurityContextW(cred, &ctx, connection->server->name, isc_req_flags, 0, 0, &in_desc, + 0, NULL, &out_desc, &attrs, NULL); + TRACE("InitializeSecurityContext ret %08x\n", status); + + if(status == SEC_E_OK) { + if(in_bufs[1].BufferType == SECBUFFER_EXTRA) + FIXME("SECBUFFER_EXTRA not supported\n"); + + status = QueryContextAttributesW(&ctx, SECPKG_ATTR_STREAM_SIZES, &connection->ssl_sizes); + if(status != SEC_E_OK) { + WARN("Could not get sizes\n"); + break; + } + + status = QueryContextAttributesW(&ctx, SECPKG_ATTR_REMOTE_CERT_CONTEXT, (void*)&cert); + if(status == SEC_E_OK) { + res = netconn_verify_cert(connection, cert, cert->hCertStore); + CertFreeCertificateContext(cert); + if(res != ERROR_SUCCESS) { + WARN("cert verify failed: %u\n", res); + break; + } + }else { + WARN("Could not get cert\n"); + break; + } + + connection->ssl_buf = heap_alloc(connection->ssl_sizes.cbHeader + connection->ssl_sizes.cbMaximumMessage + + connection->ssl_sizes.cbTrailer); + if(!connection->ssl_buf) { + res = GetLastError(); + break; + } + } + } + + + if(status != SEC_E_OK || res != ERROR_SUCCESS) { + WARN("Failed to initialize security context failed: %08x\n", status); + heap_free(connection->ssl_buf); + connection->ssl_buf = NULL; + DeleteSecurityContext(&ctx); + return res ? res : ERROR_INTERNET_SECURITY_CHANNEL_ERROR; + } + + + TRACE("established SSL connection\n"); + connection->ssl_ctx = ctx; +#endif + connection->secure = TRUE; connection->security_flags |= SECURITY_FLAG_SECURE; @@ -876,6 +1078,7 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode connection->server->security_flags = connection->security_flags; return ERROR_SUCCESS; +#ifdef SONAME_LIBSSL fail: if (ssl_s) { @@ -883,9 +1086,6 @@ fail: pSSL_free(ssl_s); } return res; -#else - FIXME("Cannot connect, OpenSSL not available.\n"); - return ERROR_NOT_SUPPORTED; #endif }

1 0