David Woodhouse : secur32: Fix handling of ANSI NTLM credentials.
Module: wine Branch: stable Commit: fd8284f2993b5f22f6164976d3e7216010d3f8b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd8284f2993b5f22f6164976d3... Author: David Woodhouse <dwmw2(a)infradead.org> Date: Thu May 26 10:45:22 2016 +0000 secur32: Fix handling of ANSI NTLM credentials. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5cc400ed60668e1739e82da1cf90ac8d6c22400b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/secur32/ntlm.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 80 insertions(+), 12 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 0fe64ed..a9de3bd 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -131,6 +131,8 @@ SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( { SECURITY_STATUS ret; PNtlmCredentials ntlm_cred; + LPWSTR domain = NULL, user = NULL, password = NULL; + PSEC_WINNT_AUTH_IDENTITY_W auth_data = NULL; TRACE("(%s, %s, 0x%08x, %p, %p, %p, %p, %p, %p)\n", debugstr_w(pszPrincipal), debugstr_w(pszPackage), fCredentialUse, @@ -158,6 +160,7 @@ SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( break; case SECPKG_CRED_OUTBOUND: { + auth_data = pAuthData; ntlm_cred = HeapAlloc(GetProcessHeap(), 0, sizeof(*ntlm_cred)); if (!ntlm_cred) { @@ -173,26 +176,84 @@ SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( if(pAuthData != NULL) { - PSEC_WINNT_AUTH_IDENTITY_W auth_data = pAuthData; + int domain_len = 0, user_len = 0, password_len = 0; - TRACE("Username is %s\n", debugstr_wn(auth_data->User, auth_data->UserLength)); - TRACE("Domain name is %s\n", debugstr_wn(auth_data->Domain, auth_data->DomainLength)); + if (auth_data->Flags & SEC_WINNT_AUTH_IDENTITY_ANSI) + { + if (auth_data->DomainLength) + { + domain_len = MultiByteToWideChar(CP_ACP, 0, (char *)auth_data->Domain, + auth_data->DomainLength, NULL, 0); + domain = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * domain_len); + if(!domain) + { + ret = SEC_E_INSUFFICIENT_MEMORY; + break; + } + MultiByteToWideChar(CP_ACP, 0, (char *)auth_data->Domain, auth_data->DomainLength, + domain, domain_len); + } + + if (auth_data->UserLength) + { + user_len = MultiByteToWideChar(CP_ACP, 0, (char *)auth_data->User, + auth_data->UserLength, NULL, 0); + user = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * user_len); + if(!user) + { + ret = SEC_E_INSUFFICIENT_MEMORY; + break; + } + MultiByteToWideChar(CP_ACP, 0, (char *)auth_data->User, auth_data->UserLength, + user, user_len); + } + + if (auth_data->PasswordLength) + { + password_len = MultiByteToWideChar(CP_ACP, 0,(char *)auth_data->Password, + auth_data->PasswordLength, NULL, 0); + password = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * password_len); + if(!password) + { + ret = SEC_E_INSUFFICIENT_MEMORY; + break; + } + MultiByteToWideChar(CP_ACP, 0, (char *)auth_data->Password, auth_data->PasswordLength, + password, password_len); + } + } + else + { + domain = auth_data->Domain; + domain_len = auth_data->DomainLength; + + user = auth_data->User; + user_len = auth_data->UserLength; + + password = auth_data->Password; + password_len = auth_data->PasswordLength; + } + + TRACE("Username is %s\n", debugstr_wn(user, user_len)); + TRACE("Domain name is %s\n", debugstr_wn(domain, domain_len)); - ntlm_cred->username_arg = ntlm_GetUsernameArg(auth_data->User, auth_data->UserLength); - ntlm_cred->domain_arg = ntlm_GetDomainArg(auth_data->Domain, auth_data->DomainLength); + ntlm_cred->username_arg = ntlm_GetUsernameArg(user, user_len); + ntlm_cred->domain_arg = ntlm_GetDomainArg(domain, domain_len); - if(auth_data->PasswordLength != 0) + if(password_len != 0) { - ntlm_cred->pwlen = WideCharToMultiByte(CP_UNIXCP, - WC_NO_BEST_FIT_CHARS, auth_data->Password, - auth_data->PasswordLength, NULL, 0, NULL, - NULL); + ntlm_cred->pwlen = WideCharToMultiByte(CP_UNIXCP, WC_NO_BEST_FIT_CHARS, password, + password_len, NULL, 0, NULL, NULL); ntlm_cred->password = HeapAlloc(GetProcessHeap(), 0, ntlm_cred->pwlen); + if(!ntlm_cred->password) + { + ret = SEC_E_INSUFFICIENT_MEMORY; + break; + } - WideCharToMultiByte(CP_UNIXCP, WC_NO_BEST_FIT_CHARS, - auth_data->Password, auth_data->PasswordLength, + WideCharToMultiByte(CP_UNIXCP, WC_NO_BEST_FIT_CHARS, password, password_len, ntlm_cred->password, ntlm_cred->pwlen, NULL, NULL); } } @@ -213,6 +274,13 @@ SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( phCredential = NULL; ret = SEC_E_UNKNOWN_CREDENTIALS; } + + if (auth_data && auth_data->Flags & SEC_WINNT_AUTH_IDENTITY_ANSI) + { + HeapFree(GetProcessHeap(), 0, domain); + HeapFree(GetProcessHeap(), 0, user); + HeapFree(GetProcessHeap(), 0, password); + } return ret; }
participants (1)
-
Alexandre Julliard