April 2021 - Wine-devel - list.winehq.org

[PATCH 03/10] msvcrt: Import jn implementation from musl.
by Piotr Caban 29 Apr '21

29 Apr '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 - dlls/msvcrt/math.c | 128 +++++++++++++++++++++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 14 ----- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 125 insertions(+), 19 deletions(-)

1 0

[PATCH 02/10] msvcrt: Import y1 implementation from musl.
by Piotr Caban 29 Apr '21

29 Apr '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 - dlls/msvcrt/math.c | 46 +++++++++++++++++++++++++++++++++---------- dlls/msvcrt/unixlib.c | 14 ------------- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 36 insertions(+), 26 deletions(-)

1 0

[PATCH 01/10] msvcrt: Import j1 implementation from musl.
by Piotr Caban 29 Apr '21

29 Apr '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 - dlls/msvcrt/math.c | 232 +++++++++++++++++++++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 14 --- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 229 insertions(+), 19 deletions(-)

1 0

[PATCH v8] ntdll: Allow renaming a file/directory to a different case of itself.
by Gabriel Ivăncescu 29 Apr '21

29 Apr '21

Renaming a file or directory from e.g. foobar to FooBar (or any other case change) should work, like on Windows, instead of being a no-op. Clobbering an existing file must also respect the new case. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46203 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- We just prepend the unix original case filename (without path) to the wineserver data before the actual unix filename, and a field `caselen` which is the length of this data. dlls/kernel32/tests/file.c | 4 +- dlls/ntdll/tests/file.c | 4 +- dlls/ntdll/unix/file.c | 63 ++++++++++++++++++++++-- server/fd.c | 98 +++++++++++++++++++++++++------------- server/protocol.def | 2 + 5 files changed, 131 insertions(+), 40 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 8560524..9ca56e1 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2040,7 +2040,7 @@ static void test_MoveFileA(void) ok(hfile != INVALID_HANDLE_VALUE, "FindFirstFileA: failed, error %d\n", GetLastError()); if (hfile != INVALID_HANDLE_VALUE) { - todo_wine ok(!lstrcmpA(strrchr(tempdir, '\\') + 1, find_data.cFileName), + ok(!lstrcmpA(strrchr(tempdir, '\\') + 1, find_data.cFileName), "MoveFile failed to change casing on same file: got %s\n", find_data.cFileName); } CloseHandle(hfile); @@ -2085,7 +2085,7 @@ static void test_MoveFileA(void) ok(hfile != INVALID_HANDLE_VALUE, "FindFirstFileA: failed, error %d\n", GetLastError()); if (hfile != INVALID_HANDLE_VALUE) { - todo_wine ok(!lstrcmpA(strrchr(tempdir, '\\') + 1, find_data.cFileName), + ok(!lstrcmpA(strrchr(tempdir, '\\') + 1, find_data.cFileName), "MoveFile failed to change casing on same directory: got %s\n", find_data.cFileName); } CloseHandle(hfile); diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index d469b44..49f4e34 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2315,7 +2315,7 @@ static void test_file_link_information(void) ok(handle != INVALID_HANDLE_VALUE, "FindFirstFileW: failed, error %d\n", GetLastError()); if (handle != INVALID_HANDLE_VALUE) { - todo_wine ok(!lstrcmpW(wcsrchr(newpath, '\\') + 1, find_data.cFileName), + ok(!lstrcmpW(wcsrchr(newpath, '\\') + 1, find_data.cFileName), "Link did not change casing on existing target file: got %s\n", wine_dbgstr_w(find_data.cFileName)); } @@ -2900,7 +2900,7 @@ static void test_file_link_information(void) ok(handle != INVALID_HANDLE_VALUE, "FindFirstFileW: failed, error %d\n", GetLastError()); if (handle != INVALID_HANDLE_VALUE) { - todo_wine ok(!lstrcmpW(wcsrchr(oldpath, '\\') + 1, find_data.cFileName), + ok(!lstrcmpW(wcsrchr(oldpath, '\\') + 1, find_data.cFileName), "Link did not change casing on same file: got %s\n", wine_dbgstr_w(find_data.cFileName)); } diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index e32de57..a3af5bb 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -3400,6 +3400,55 @@ NTSTATUS nt_to_unix_file_name( const OBJECT_ATTRIBUTES *attr, char **name_ret, U } +/*********************************************************************** + * nt_to_unix_file_name_with_actual_case + * + * Same as nt_to_unix_file_name, but additionally return unix file name + * without path, with the actual case from the NT file name. + */ +static NTSTATUS nt_to_unix_file_name_with_actual_case( const OBJECT_ATTRIBUTES *attr, char **name_ret, + char **actual_case_ret, UINT disposition ) +{ + const WCHAR *nt_filename = attr->ObjectName->Buffer; + char *actual_case; + NTSTATUS status; + int len; + + /* strip off trailing backslashes; we also accept '/' for unix namespaces */ + for (len = attr->ObjectName->Length / sizeof(WCHAR); len != 0; len--) + if (nt_filename[len - 1] != '\\' && nt_filename[len - 1] != '/') + break; + + /* get the last component */ + for (nt_filename += len; nt_filename != attr->ObjectName->Buffer; nt_filename--) + if (nt_filename[-1] == '\\' || nt_filename[-1] == '/') + break; + len = attr->ObjectName->Buffer + len - nt_filename; + + if (!(actual_case = malloc( len * 3 + 1 ))) return STATUS_NO_MEMORY; + + status = nt_to_unix_file_name( attr, name_ret, disposition ); + if (status != STATUS_SUCCESS && status != STATUS_NO_SUCH_FILE) + { + free( actual_case ); + return status; + } + + len = ntdll_wcstoumbs( nt_filename, len, actual_case, len * 3, TRUE ); + if (len > 0) + actual_case[len] = 0; + else + { + char *p = strrchr( *name_ret, '/' ); + p = p ? p + 1 : *name_ret; + strcpy( actual_case, p ); + } + + *actual_case_ret = actual_case; + return status; +} + + /****************************************************************************** * wine_nt_to_unix_file_name * @@ -4522,8 +4571,8 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, { FILE_RENAME_INFORMATION *info = ptr; UNICODE_STRING name_str, redir; + char *unix_name, *file_case; OBJECT_ATTRIBUTES attr; - char *unix_name; name_str.Buffer = info->FileName; name_str.Length = info->FileNameLength; @@ -4531,7 +4580,7 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, InitializeObjectAttributes( &attr, &name_str, OBJ_CASE_INSENSITIVE, info->RootDirectory, NULL ); get_redirect( &attr, &redir ); - io->u.Status = nt_to_unix_file_name( &attr, &unix_name, FILE_OPEN_IF ); + io->u.Status = nt_to_unix_file_name_with_actual_case( &attr, &unix_name, &file_case, FILE_OPEN_IF ); if (io->u.Status == STATUS_SUCCESS || io->u.Status == STATUS_NO_SUCH_FILE) { SERVER_START_REQ( set_fd_name_info ) @@ -4539,15 +4588,18 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, req->handle = wine_server_obj_handle( handle ); req->rootdir = wine_server_obj_handle( attr.RootDirectory ); req->namelen = attr.ObjectName->Length; + req->caselen = strlen( file_case ); req->link = FALSE; req->replace = info->ReplaceIfExists; wine_server_add_data( req, attr.ObjectName->Buffer, attr.ObjectName->Length ); + wine_server_add_data( req, file_case, req->caselen ); wine_server_add_data( req, unix_name, strlen(unix_name) ); io->u.Status = wine_server_call( req ); } SERVER_END_REQ; free( unix_name ); + free( file_case ); } free( redir.Buffer ); } @@ -4559,8 +4611,8 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, { FILE_LINK_INFORMATION *info = ptr; UNICODE_STRING name_str, redir; + char *unix_name, *file_case; OBJECT_ATTRIBUTES attr; - char *unix_name; name_str.Buffer = info->FileName; name_str.Length = info->FileNameLength; @@ -4568,7 +4620,7 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, InitializeObjectAttributes( &attr, &name_str, OBJ_CASE_INSENSITIVE, info->RootDirectory, NULL ); get_redirect( &attr, &redir ); - io->u.Status = nt_to_unix_file_name( &attr, &unix_name, FILE_OPEN_IF ); + io->u.Status = nt_to_unix_file_name_with_actual_case( &attr, &unix_name, &file_case, FILE_OPEN_IF ); if (io->u.Status == STATUS_SUCCESS || io->u.Status == STATUS_NO_SUCH_FILE) { SERVER_START_REQ( set_fd_name_info ) @@ -4576,15 +4628,18 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, req->handle = wine_server_obj_handle( handle ); req->rootdir = wine_server_obj_handle( attr.RootDirectory ); req->namelen = attr.ObjectName->Length; + req->caselen = strlen( file_case ); req->link = TRUE; req->replace = info->ReplaceIfExists; wine_server_add_data( req, attr.ObjectName->Buffer, attr.ObjectName->Length ); + wine_server_add_data( req, file_case, req->caselen ); wine_server_add_data( req, unix_name, strlen(unix_name) ); io->u.Status = wine_server_call( req ); } SERVER_END_REQ; free( unix_name ); + free( file_case ); } free( redir.Buffer ); } diff --git a/server/fd.c b/server/fd.c index 481e9a8..3e51528 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2488,11 +2488,14 @@ static void set_fd_disposition( struct fd *fd, int unlink ) /* set new name for the fd */ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, data_size_t len, - struct unicode_str nt_name, int create_link, int replace ) + const char *file_case, data_size_t caselen, struct unicode_str nt_name, + int create_link, int replace ) { + size_t pathlen, filenamelen; struct inode *inode; struct stat st, st2; - char *name; + int different_case; + char *name, *tmp; if (!fd->inode || !fd->unix_name) { @@ -2526,6 +2529,23 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, da name = combined_name; } + tmp = strrchr( name, '/' ); + tmp = tmp ? tmp + 1 : name; + pathlen = tmp - name; + filenamelen = strlen( tmp ); + different_case = (filenamelen != caselen || memcmp( tmp, file_case, caselen )); + + if (filenamelen < caselen) + { + tmp = realloc( name, pathlen + caselen + 1 ); + if (!tmp) + { + set_error( STATUS_NO_MEMORY ); + goto failed; + } + name = tmp; + } + /* when creating a hard link, source cannot be a dir */ if (create_link && !fstat( fd->unix_fd, &st ) && S_ISDIR( st.st_mode )) { @@ -2538,47 +2558,58 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, da if (!fstat( fd->unix_fd, &st2 ) && st.st_ino == st2.st_ino && st.st_dev == st2.st_dev) { if (create_link && !replace) set_error( STATUS_OBJECT_NAME_COLLISION ); - free( name ); - return; - } + if (!different_case) + { + free( name ); + return; + } - if (!replace) - { - set_error( STATUS_OBJECT_NAME_COLLISION ); - goto failed; + /* creating a link with a different case on itself renames the file */ + create_link = 0; } - - /* can't replace directories or special files */ - if (!S_ISREG( st.st_mode )) + else { - set_error( STATUS_ACCESS_DENIED ); - goto failed; - } + if (!replace) + { + set_error( STATUS_OBJECT_NAME_COLLISION ); + goto failed; + } - /* can't replace an opened file */ - if ((inode = get_inode( st.st_dev, st.st_ino, -1 ))) - { - int is_empty = list_empty( &inode->open ); - release_object( inode ); - if (!is_empty) + /* can't replace directories or special files */ + if (!S_ISREG( st.st_mode )) { set_error( STATUS_ACCESS_DENIED ); goto failed; } - } - /* link() expects that the target doesn't exist */ - /* rename() cannot replace files with directories */ - if (create_link || S_ISDIR( st2.st_mode )) - { - if (unlink( name )) + /* can't replace an opened file */ + if ((inode = get_inode( st.st_dev, st.st_ino, -1 ))) { - file_set_error(); - goto failed; + int is_empty = list_empty( &inode->open ); + release_object( inode ); + if (!is_empty) + { + set_error( STATUS_ACCESS_DENIED ); + goto failed; + } + } + + /* link() expects that the target doesn't exist */ + /* rename() cannot replace files with directories */ + if (create_link || S_ISDIR( st2.st_mode ) || different_case) + { + if (unlink( name )) + { + file_set_error(); + goto failed; + } } } } + memcpy( name + pathlen, file_case, caselen ); + name[pathlen + caselen] = 0; + if (create_link) { if (link( fd->unix_name, name )) @@ -2879,16 +2910,19 @@ DECL_HANDLER(set_fd_disp_info) /* set fd name information */ DECL_HANDLER(set_fd_name_info) { + const char *fullname, *file_case; struct fd *fd, *root_fd = NULL; struct unicode_str nt_name; - if (req->namelen > get_req_data_size()) + if (req->namelen > get_req_data_size() || get_req_data_size() - req->namelen < req->caselen) { set_error( STATUS_INVALID_PARAMETER ); return; } nt_name.str = get_req_data(); nt_name.len = (req->namelen / sizeof(WCHAR)) * sizeof(WCHAR); + file_case = (const char *)get_req_data() + req->namelen; + fullname = file_case + req->caselen; if (req->rootdir) { @@ -2902,8 +2936,8 @@ DECL_HANDLER(set_fd_name_info) if ((fd = get_handle_fd_obj( current->process, req->handle, 0 ))) { - set_fd_name( fd, root_fd, (const char *)get_req_data() + req->namelen, - get_req_data_size() - req->namelen, nt_name, req->link, req->replace ); + set_fd_name( fd, root_fd, fullname, (const char *)get_req_data() + get_req_data_size() - fullname, + file_case, req->caselen, nt_name, req->link, req->replace ); release_object( fd ); } if (root_fd) release_object( root_fd ); diff --git a/server/protocol.def b/server/protocol.def index 7c22fae..a4517e6 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3527,9 +3527,11 @@ struct handle_info obj_handle_t handle; /* handle to a file or directory */ obj_handle_t rootdir; /* root directory */ data_size_t namelen; /* length of NT name in bytes */ + data_size_t caselen; /* length of the actual case filename */ int link; /* link instead of renaming */ int replace; /* replace an existing file? */ VARARG(name,unicode_str,namelen); /* NT name */ + VARARG(actual_case,string,caselen); /* new file name's actual case (without path) */ VARARG(filename,string); /* new file name */ @END -- 2.30.0

3 5

[PATCH] reg: Use correct error message if RegCreateKeyExW() fails
by Hugh McMaster 29 Apr '21

29 Apr '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/add.c | 2 +- programs/reg/reg.rc | 1 + programs/reg/resource.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/programs/reg/add.c b/programs/reg/add.c index ff209bfc0ff..db909167f30 100644 --- a/programs/reg/add.c +++ b/programs/reg/add.c @@ -157,7 +157,7 @@ static int run_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, if (RegCreateKeyExW(root, path, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_READ|KEY_WRITE, NULL, &hkey, NULL)) { - output_message(STRING_INVALID_KEY); + output_message(STRING_ACCESS_DENIED); return 1; } diff --git a/programs/reg/reg.rc b/programs/reg/reg.rc index 021734db0a7..0f8ff4a5bc4 100644 --- a/programs/reg/reg.rc +++ b/programs/reg/reg.rc @@ -176,4 +176,5 @@ STRINGTABLE \ Access the registry using the 32-bit view.\n\n\ \ /reg:64\n\ \ Access the registry using the 64-bit view.\n\n" + STRING_ACCESS_DENIED, "reg: Unable to access or create the specified registry key\n" } diff --git a/programs/reg/resource.h b/programs/reg/resource.h index b673e21883a..b569eb41d3d 100644 --- a/programs/reg/resource.h +++ b/programs/reg/resource.h @@ -62,3 +62,4 @@ #define STRING_KEY_NONEXIST 139 #define STRING_KEY_IMPORT_FAILED 140 #define STRING_REG_VIEW_USAGE 141 +#define STRING_ACCESS_DENIED 142 -- 2.31.1

1 0

[PATCH] winex11.drv: Fix drawing of layered windows with a client window.
by Giovanni Mascellani 29 Apr '21

29 Apr '21

Testing on Windows 10, it seems that when a window has both a surface (because it is layered) and a client window (because a d3d9 or analogous device was created for it), the surface takes the priority, i.e., gdi and d3d9 are ignored, and just the layered bitmap is painted. Before this change, expose events lead to redrawing the surface only on the whole window, but not on the client window. This implies that if a d3d9 device is created for a layered window, it takes the priority in the client window region, contradicting the behavior observed on Windows. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/winex11.drv/event.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 99943478729..38c8bd825bb 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -938,21 +938,21 @@ static BOOL X11DRV_Expose( HWND hwnd, XEvent *xev ) rect.right = pos.x + event->width; rect.bottom = pos.y + event->height; - if (event->window != data->client_window) + if (event->window == data->client_window) + OffsetRect( &rect, data->client_rect.left - data->whole_rect.left, + data->client_rect.top - data->whole_rect.top ); + if (data->surface) { - if (data->surface) - { - surface_region = expose_surface( data->surface, &rect ); - if (!surface_region) flags = 0; - else OffsetRgn( surface_region, data->whole_rect.left - data->client_rect.left, - data->whole_rect.top - data->client_rect.top ); + surface_region = expose_surface( data->surface, &rect ); + if (!surface_region) flags = 0; + else OffsetRgn( surface_region, data->whole_rect.left - data->client_rect.left, + data->whole_rect.top - data->client_rect.top ); - if (data->vis.visualid != default_visual.visualid) - data->surface->funcs->flush( data->surface ); - } - OffsetRect( &rect, data->whole_rect.left - data->client_rect.left, - data->whole_rect.top - data->client_rect.top ); + if (data->vis.visualid != default_visual.visualid) + data->surface->funcs->flush( data->surface ); } + OffsetRect( &rect, data->whole_rect.left - data->client_rect.left, + data->whole_rect.top - data->client_rect.top ); if (event->window != root_window) { -- 2.31.1

3 5

[PATCH] winetest: Fix the path to the ntoskrnl.exe/tests source.
by Francois Gouget 29 Apr '21

29 Apr '21

It's the only test with a .exe extension for which the source is not in programs! Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- programs/winetest/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index ce3fbb4224a..290cd5f086f 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -518,7 +518,8 @@ static const char* get_test_source_file(const char* test, const char* subtest) static char buffer[MAX_PATH]; int len = strlen(test); - if (len > 4 && !strcmp( test + len - 4, ".exe" )) + if (len > 4 && !strcmp( test + len - 4, ".exe" ) && + strcmp( test, "ntoskrnl.exe" )) /* the one exception! */ { len = sprintf(buffer, "programs/%s", test) - 4; buffer[len] = 0; -- 2.20.1

1 0

[PATCH 2/2] winevulkan: Use wine_ prefix for Unix thunks.
by Jacek Caban 29 Apr '21

29 Apr '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 4 +- dlls/winevulkan/vulkan.c | 98 ++++++++++++++++++------------------- 2 files changed, 51 insertions(+), 51 deletions(-)

1 0

[PATCH 1/2] winevulkan: Don't use wine_ prefix on PE side.
by Jacek Caban 29 Apr '21

29 Apr '21

There is no ABI ambiguity, so we may just use public names. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/loader.c | 34 ++++++++++++++--------------- dlls/winevulkan/make_vulkan | 37 +++++++++++--------------------- dlls/winevulkan/vulkan_loader.h | 2 -- dlls/winevulkan/vulkan_private.h | 1 + 4 files changed, 31 insertions(+), 43 deletions(-)

1 0

[PATCH 5/5] msv1_0: Implement SpInitLsaModeContext and SpDeleteContext.
by Hans Leidekker 29 Apr '21

29 Apr '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msv1_0/Makefile.in | 1 + dlls/msv1_0/main.c | 561 +++++++++++++++++++++++++++++++++++++++- dlls/msv1_0/unixlib.c | 68 +++++ dlls/msv1_0/unixlib.h | 1 + 4 files changed, 629 insertions(+), 2 deletions(-) diff --git a/dlls/msv1_0/Makefile.in b/dlls/msv1_0/Makefile.in index 21a9c61e317..6e7a8f958d3 100644 --- a/dlls/msv1_0/Makefile.in +++ b/dlls/msv1_0/Makefile.in @@ -1,4 +1,5 @@ MODULE = msv1_0.dll +IMPORTS = netapi32 advapi32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/msv1_0/main.c b/dlls/msv1_0/main.c index 7dabd8e2ff5..e07dcf6f352 100644 --- a/dlls/msv1_0/main.c +++ b/dlls/msv1_0/main.c @@ -19,6 +19,7 @@ #include <stdarg.h> #include <stdlib.h> +#include <wchar.h> #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -28,6 +29,10 @@ #include "ntsecapi.h" #include "ntsecpkg.h" #include "rpc.h" +#include "wincred.h" +#include "lmwksta.h" +#include "lmapibuf.h" +#include "lmerr.h" #include "wine/debug.h" #include "unixlib.h" @@ -282,6 +287,558 @@ static NTSTATUS NTAPI ntlm_SpFreeCredentialsHandle( LSA_SEC_HANDLE handle ) return SEC_E_OK; } +static BOOL get_cached_credential( const UNICODE_STRING *target, CREDENTIALW **cred ) +{ + const WCHAR *ptr, *host; + WCHAR *hostonly; + size_t len; + BOOL ret; + + if (!target) return FALSE; + + len = target->Length / sizeof(WCHAR); + if ((host = wmemchr( target->Buffer, '/', len ))) + { + host++; + len -= host - target->Buffer; + if (!(ptr = wmemchr( host, ':', len ))) ptr = wmemchr( host, '/', len ); + if (!ptr) ptr = host + len; + } + else + { + host = target->Buffer; + ptr = host + len; + } + + if (!(hostonly = malloc( (ptr - host + 1) * sizeof(WCHAR) ))) return FALSE; + memcpy( hostonly, host, (ptr - host) * sizeof(WCHAR) ); + hostonly[ptr - host] = 0; + + ret = CredReadW( hostonly, CRED_TYPE_DOMAIN_PASSWORD, 0, cred ); + free( hostonly ); + return ret; +} + +static UINT encode_base64( const char *bin, unsigned int len, char *base64 ) +{ + static const char base64enc[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + UINT n = 0, x; + + while (len > 0) + { + /* first 6 bits, all from bin[0] */ + base64[n++] = base64enc[(bin[0] & 0xfc) >> 2]; + x = (bin[0] & 3) << 4; + + /* next 6 bits, 2 from bin[0] and 4 from bin[1] */ + if (len == 1) + { + base64[n++] = base64enc[x]; + base64[n++] = '='; + base64[n++] = '='; + break; + } + base64[n++] = base64enc[x | ((bin[1] & 0xf0) >> 4)]; + x = (bin[1] & 0x0f) << 2; + + /* next 6 bits 4 from bin[1] and 2 from bin[2] */ + if (len == 2) + { + base64[n++] = base64enc[x]; + base64[n++] = '='; + break; + } + base64[n++] = base64enc[x | ((bin[2] & 0xc0) >> 6)]; + + /* last 6 bits, all from bin[2] */ + base64[n++] = base64enc[bin[2] & 0x3f]; + bin += 3; + len -= 3; + } + base64[n] = 0; + return n; +} + +static inline char decode_char( char c ) +{ + if (c >= 'A' && c <= 'Z') return c - 'A'; + if (c >= 'a' && c <= 'z') return c - 'a' + 26; + if (c >= '0' && c <= '9') return c - '0' + 52; + if (c == '+') return 62; + if (c == '/') return 63; + return 64; +} + +static unsigned int decode_base64( const char *base64, unsigned int len, char *buf ) +{ + unsigned int i = 0; + char c0, c1, c2, c3; + const char *p = base64; + + while (len > 4) + { + if ((c0 = decode_char( p[0] )) > 63) return 0; + if ((c1 = decode_char( p[1] )) > 63) return 0; + if ((c2 = decode_char( p[2] )) > 63) return 0; + if ((c3 = decode_char( p[3] )) > 63) return 0; + if (buf) + { + buf[i + 0] = (c0 << 2) | (c1 >> 4); + buf[i + 1] = (c1 << 4) | (c2 >> 2); + buf[i + 2] = (c2 << 6) | c3; + } + len -= 4; + i += 3; + p += 4; + } + if (p[2] == '=') + { + if ((c0 = decode_char( p[0] )) > 63) return 0; + if ((c1 = decode_char( p[1] )) > 63) return 0; + if (buf) buf[i] = (c0 << 2) | (c1 >> 4); + i++; + } + else if (p[3] == '=') + { + if ((c0 = decode_char( p[0] )) > 63) return 0; + if ((c1 = decode_char( p[1] )) > 63) return 0; + if ((c2 = decode_char( p[2] )) > 63) return 0; + if (buf) + { + buf[i + 0] = (c0 << 2) | (c1 >> 4); + buf[i + 1] = (c1 << 4) | (c2 >> 2); + } + i += 2; + } + else + { + if ((c0 = decode_char( p[0] )) > 63) return 0; + if ((c1 = decode_char( p[1] )) > 63) return 0; + if ((c2 = decode_char( p[2] )) > 63) return 0; + if ((c3 = decode_char( p[3] )) > 63) return 0; + if (buf) + { + buf[i + 0] = (c0 << 2) | (c1 >> 4); + buf[i + 1] = (c1 << 4) | (c2 >> 2); + buf[i + 2] = (c2 << 6) | c3; + } + i += 3; + } + return i; +} + +struct md4_ctx +{ + unsigned int buf[4]; + unsigned int i[2]; + unsigned char in[64]; + unsigned char digest[16]; +}; + +void WINAPI MD4Init( struct md4_ctx * ); +void WINAPI MD4Update( struct md4_ctx *, const char *, unsigned int ); +void WINAPI MD4Final( struct md4_ctx * ); + +static void create_ntlm1_session_key( const char *secret, unsigned int len, char *session_key ) +{ + struct md4_ctx ctx; + char hash[16]; + + MD4Init( &ctx ); + MD4Update( &ctx, secret, len ); + MD4Final( &ctx ); + memcpy( hash, ctx.digest, 16 ); + + MD4Init( &ctx ); + MD4Update( &ctx, hash, 16 ); + MD4Final( &ctx ); + memcpy( session_key, ctx.digest, 16 ); +} + +struct md5_ctx +{ + unsigned int i[2]; + unsigned int buf[4]; + unsigned char in[64]; + unsigned char digest[16]; +}; + +void WINAPI MD5Init( struct md5_ctx * ); +void WINAPI MD5Update( struct md5_ctx *, const char *, unsigned int ); +void WINAPI MD5Final( struct md5_ctx * ); + +static void calc_ntlm2_subkey( const char *session_key, const char *magic, char *subkey ) +{ + struct md5_ctx ctx; + + MD5Init( &ctx ); + MD5Update( &ctx, session_key, 16 ); + MD5Update( &ctx, magic, strlen(magic) + 1 ); + MD5Final( &ctx ); + memcpy( subkey, ctx.digest, 16 ); +} + +static const char client_to_server_sign_constant[] = "session key to client-to-server signing key magic constant"; +static const char client_to_server_seal_constant[] = "session key to client-to-server sealing key magic constant"; +static const char server_to_client_sign_constant[] = "session key to server-to-client signing key magic constant"; +static const char server_to_client_seal_constant[] = "session key to server-to-client sealing key magic constant"; + +static void create_ntlm2_subkeys( struct ntlm_ctx *ctx ) +{ + if (ctx->mode == MODE_CLIENT) + { + calc_ntlm2_subkey( ctx->session_key, client_to_server_sign_constant, ctx->crypt.ntlm2.send_sign_key ); + calc_ntlm2_subkey( ctx->session_key, client_to_server_seal_constant, ctx->crypt.ntlm2.send_seal_key ); + calc_ntlm2_subkey( ctx->session_key, server_to_client_sign_constant, ctx->crypt.ntlm2.recv_sign_key ); + calc_ntlm2_subkey( ctx->session_key, server_to_client_seal_constant, ctx->crypt.ntlm2.recv_seal_key ); + } + else + { + calc_ntlm2_subkey( ctx->session_key, server_to_client_sign_constant, ctx->crypt.ntlm2.send_sign_key ); + calc_ntlm2_subkey( ctx->session_key, server_to_client_seal_constant, ctx->crypt.ntlm2.send_seal_key ); + calc_ntlm2_subkey( ctx->session_key, client_to_server_sign_constant, ctx->crypt.ntlm2.recv_sign_key ); + calc_ntlm2_subkey( ctx->session_key, client_to_server_seal_constant, ctx->crypt.ntlm2.recv_seal_key ); + } +} + +/* + * The arc4 code is based on dlls/advapi32/crypt_arc4.c by Mike McCormack, + * which in turn is based on public domain code by Wei Dai + */ +static void arc4_init( struct arc4_info *info, const char *key, unsigned int len ) +{ + unsigned int key_idx = 0, state_idx = 0, i, a; + + info->x = info->y = 0; + for (i = 0; i < 256; i++) info->state[i] = i; + + for (i = 0; i < 256; i++) + { + a = info->state[i]; + state_idx += key[key_idx] + a; + state_idx &= 0xff; + info->state[i] = info->state[state_idx]; + info->state[state_idx] = a; + if (++key_idx >= len) key_idx = 0; + } +} + +static int get_buffer_index( SecBufferDesc *desc, ULONG type ) +{ + int idx; + for (idx = 0; idx < desc->cBuffers; idx++) + { + if (desc->pBuffers[idx].BufferType == type) return idx; + } + return -1; +} + +static NTSTATUS NTAPI ntlm_SpInitLsaModeContext( LSA_SEC_HANDLE cred_handle, LSA_SEC_HANDLE ctx_handle, + UNICODE_STRING *target, ULONG ctx_req, ULONG data_rep, + SecBufferDesc *input, LSA_SEC_HANDLE *new_ctx_handle, + SecBufferDesc *output, ULONG *ctx_attr, TimeStamp *expiry, + BOOLEAN *mapped_ctx, SecBuffer *ctx_data ) +{ + NTSTATUS status = SEC_E_INSUFFICIENT_MEMORY; + struct ntlm_ctx *ctx = NULL; + char *buf, *bin, *want_flags = NULL, *username = NULL, *domain = NULL, *password = NULL; + unsigned int len, bin_len; + int idx; + + TRACE( "%lx, %lx, %s, 0x%08x, %u, %p, %p, %p, %p, %p, %p, %p\n", cred_handle, ctx_handle, debugstr_us(target), + ctx_req, data_rep, input, new_ctx_handle, output, ctx_attr, expiry, mapped_ctx, ctx_data ); + + /* when communicating with the client there can be the following reply packets: + * YR <base64 blob> should be sent to the server + * PW should be sent back to helper with base64 encoded password + * AF <base64 blob> client is done, blob should be sent to server with KK prefixed + * GF <string list> a string list of negotiated flags + * GK <base64 blob> base64 encoded session key + * BH <char reason> something broke + * + * The squid cache size is 2010 chars and that's what ntlm_auth uses */ + + if (!(buf = malloc( NTLM_MAX_BUF ))) return SEC_E_INSUFFICIENT_MEMORY; + if (!(bin = malloc( NTLM_MAX_BUF ))) goto done; + + if (!ctx_handle && !input) + { + char *argv[5]; + int password_len = 0; + struct ntlm_cred *cred = (struct ntlm_cred *)cred_handle; + + if (!cred || cred->mode != MODE_CLIENT) + { + status = SEC_E_INVALID_HANDLE; + goto done; + } + + argv[0] = (char *)"ntlm_auth"; + argv[1] = (char *)"--helper-protocol=ntlmssp-client-1"; + if (!cred->username_arg && !cred->domain_arg) + { + WKSTA_USER_INFO_1 *ui = NULL; + NET_API_STATUS ret; + CREDENTIALW *cached; + + if (get_cached_credential( target, &cached )) + { + WCHAR *p; + if ((p = wcschr( cached->UserName, '\\' ))) + { + if (!(domain = get_domain_arg( cached->UserName, p - cached->UserName ))) goto done; + p++; + } + else + { + if (!(domain = get_domain_arg( NULL, 0 ))) goto done; + p = cached->UserName; + } + if (!(username = get_username_arg( p, -1 ))) goto done; + + if (cached->CredentialBlobSize) + { + password_len = WideCharToMultiByte( CP_UNIXCP, WC_NO_BEST_FIT_CHARS, (WCHAR *)cached->CredentialBlob, + cached->CredentialBlobSize / sizeof(WCHAR), NULL, 0, NULL, NULL ); + if (!(password = malloc( password_len ))) goto done; + WideCharToMultiByte( CP_UNIXCP, WC_NO_BEST_FIT_CHARS, (WCHAR *)cached->CredentialBlob, + cached->CredentialBlobSize / sizeof(WCHAR), password, password_len, NULL, NULL ); + } + CredFree( cached ); + + argv[2] = username; + argv[3] = domain; + argv[4] = NULL; + } + else + { + ret = NetWkstaUserGetInfo( NULL, 1, (BYTE **)&ui ); + if (ret != NERR_Success || !ui || cred->no_cached_credentials) + { + status = SEC_E_NO_CREDENTIALS; + goto done; + } + if (!(username = get_username_arg( ui->wkui1_username, -1 ))) goto done; + NetApiBufferFree( ui ); + TRACE("using cached credentials\n"); + + argv[2] = username; + argv[3] = (char *)"--use-cached-creds"; + argv[4] = NULL; + } + } + else + { + argv[2] = cred->username_arg; + argv[3] = cred->domain_arg; + argv[4] = NULL; + } + + if ((status = ntlm_funcs->fork( argv, &ctx )) != SEC_E_OK) goto done; + status = SEC_E_INSUFFICIENT_MEMORY; + + ctx->mode = MODE_CLIENT; + memset( ctx->session_key, 0, sizeof(ctx->session_key) ); + + /* generate the dummy session key = MD4(MD4(password))*/ + if (password || cred->password) + { + WCHAR *passwordW; + len = MultiByteToWideChar( CP_ACP, 0, password ? password : cred->password, + password ? password_len : cred->password_len, NULL, 0 ); + if (!(passwordW = malloc( len * sizeof(WCHAR) ))) goto done; + MultiByteToWideChar( CP_ACP, 0, password ? password : cred->password, + password ? password_len : cred->password_len, passwordW, len ); + + create_ntlm1_session_key( (const char *)passwordW, len * sizeof(WCHAR), ctx->session_key ); + free( passwordW ); + } + + /* allocate space for a maximum string of + * "SF NTLMSSP_FEATURE_SIGN NTLMSSP_FEATURE_SEAL NTLMSSP_FEATURE_SESSION_KEY" + */ + if (!(want_flags = malloc( 73 ))) goto done; + strcpy( want_flags, "SF" ); + if (ctx_req & ISC_REQ_CONFIDENTIALITY) strcat( want_flags, " NTLMSSP_FEATURE_SEAL" ); + if ((ctx_req & ISC_REQ_INTEGRITY) || (ctx_req & ISC_REQ_REPLAY_DETECT) || + (ctx_req & ISC_REQ_SEQUENCE_DETECT)) strcat( want_flags, " NTLMSSP_FEATURE_SIGN" ); + + if (ctx_req & ISC_REQ_CONNECTION) ctx->attrs |= ISC_RET_CONNECTION; + if (ctx_req & ISC_REQ_EXTENDED_ERROR) ctx->attrs |= ISC_RET_EXTENDED_ERROR; + if (ctx_req & ISC_REQ_MUTUAL_AUTH) ctx->attrs |= ISC_RET_MUTUAL_AUTH; + if (ctx_req & ISC_REQ_USE_DCE_STYLE) ctx->attrs |= ISC_RET_USED_DCE_STYLE; + if (ctx_req & ISC_REQ_DELEGATE) ctx->attrs |= ISC_RET_DELEGATE; + if (ctx_req & ISC_REQ_STREAM) FIXME( "ISC_REQ_STREAM\n" ); + + /* use cached credentials if no password was given, fall back to an empty password on failure */ + if (!password && !cred->password) + { + strcpy( buf, "OK" ); + if ((status = ntlm_funcs->chat( ctx, buf, NTLM_MAX_BUF, &len )) != SEC_E_OK) goto done; + + /* if the helper replied with "PW" using cached credentials failed */ + if (!strncmp( buf, "PW", 2 )) + { + TRACE( "using cached credentials failed\n" ); + strcpy( buf, "PW AA==" ); + } + else strcpy( buf, "OK" ); /* just do a noop on the next run */ + } + else + { + strcpy( buf, "PW " ); + encode_base64( password ? password : cred->password, password ? password_len : cred->password_len, buf + 3 ); + } + + TRACE( "sending to ntlm_auth: %s\n", debugstr_a(buf) ); + if ((status = ntlm_funcs->chat( ctx, buf, NTLM_MAX_BUF, &len )) != SEC_E_OK) goto done; + TRACE( "ntlm_auth returned %s\n", debugstr_a(buf) ); + + if (strlen( want_flags ) > 2) + { + TRACE( "want flags are %s\n", debugstr_a(want_flags) ); + strcpy( buf, want_flags ); + if ((status = ntlm_funcs->chat( ctx, buf, NTLM_MAX_BUF, &len )) != SEC_E_OK) goto done; + if (!strncmp( buf, "BH", 2 )) ERR( "ntlm_auth doesn't understand new command set\n" ); + } + + strcpy( buf, "YR" ); + if ((status = ntlm_funcs->chat( ctx, buf, NTLM_MAX_BUF, &len )) != SEC_E_OK) goto done; + TRACE( "ntlm_auth returned %s\n", buf ); + if (strncmp( buf, "YR ", 3 )) + { + status = SEC_E_INTERNAL_ERROR; + goto done; + } + bin_len = decode_base64( buf + 3, len - 3, bin ); + + *new_ctx_handle = (LSA_SEC_HANDLE)ctx; + status = SEC_I_CONTINUE_NEEDED; + } + else /* !ctx_handle && !input */ + { + if (!input || ((idx = get_buffer_index( input, SECBUFFER_TOKEN )) == -1)) + { + status = SEC_E_INVALID_TOKEN; + goto done; + } + + ctx = (struct ntlm_ctx *)ctx_handle; + if (!ctx || ctx->mode != MODE_CLIENT) + { + status = SEC_E_INVALID_HANDLE; + goto done; + } + + if (!input->pBuffers[idx].pvBuffer || input->pBuffers[idx].cbBuffer > NTLM_MAX_BUF) + { + status = SEC_E_INVALID_TOKEN; + goto done; + } + bin_len = input->pBuffers[idx].cbBuffer; + memcpy( bin, input->pBuffers[idx].pvBuffer, bin_len ); + + strcpy( buf, "TT " ); + encode_base64( bin, bin_len, buf + 3 ); + TRACE( "server sent: %s\n", debugstr_a(buf) ); + + if ((status = ntlm_funcs->chat( ctx, buf, NTLM_MAX_BUF, &len ))) goto done; + TRACE( "ntlm_auth returned: %s\n", debugstr_a(buf) ); + + if (strncmp( buf, "KK ", 3 ) && strncmp( buf, "AF ", 3 )) + { + status = SEC_E_INVALID_TOKEN; + goto done; + } + bin_len = decode_base64( buf + 3, len - 3, bin ); + + *new_ctx_handle = (LSA_SEC_HANDLE)ctx; + status = SEC_E_OK; + } + + if (!output || ((idx = get_buffer_index( output, SECBUFFER_TOKEN )) == -1)) + { + if (!ctx_handle && !input) *new_ctx_handle = 0; + status = SEC_E_BUFFER_TOO_SMALL; + goto done; + } + + if (ctx_req & ISC_REQ_ALLOCATE_MEMORY) + { + if (!(output->pBuffers[idx].pvBuffer = malloc( bin_len ))) + { + status = SEC_E_INSUFFICIENT_MEMORY; + goto done; + } + output->pBuffers[idx].cbBuffer = bin_len; + } + else if (output->pBuffers[idx].cbBuffer < bin_len) + { + if (!ctx_handle && !input) *new_ctx_handle = 0; + status = SEC_E_BUFFER_TOO_SMALL; + goto done; + } + + if (!output->pBuffers[idx].pvBuffer) + { + if (!ctx_handle && !input) *new_ctx_handle = 0; + status = SEC_E_INTERNAL_ERROR; + goto done; + } + + output->pBuffers[idx].cbBuffer = bin_len; + memcpy( output->pBuffers[idx].pvBuffer, bin, bin_len ); + if (status == SEC_E_OK) + { + strcpy( buf, "GF" ); + if ((status = ntlm_funcs->chat( ctx, buf, NTLM_MAX_BUF, &len )) != SEC_E_OK) goto done; + if (len < 3) ctx->flags = 0; + else sscanf( buf + 3, "%x", &ctx->flags ); + + strcpy( buf, "GK" ); + if ((status = ntlm_funcs->chat( ctx, buf, NTLM_MAX_BUF, &len )) != SEC_E_OK) goto done; + + if (!strncmp( buf, "BH", 2 )) TRACE( "no key negotiated\n" ); + else if (!strncmp( buf, "GK ", 3 )) + { + bin_len = decode_base64( buf + 3, len - 3, bin ); + TRACE( "session key is %s\n", debugstr_a(buf + 3) ); + memcpy( ctx->session_key, bin, bin_len ); + } + + arc4_init( &ctx->crypt.ntlm.arc4info, ctx->session_key, 16 ); + ctx->crypt.ntlm.seq_no = 0; + create_ntlm2_subkeys( ctx ); + arc4_init( &ctx->crypt.ntlm2.send_arc4info, ctx->crypt.ntlm2.send_seal_key, 16 ); + arc4_init( &ctx->crypt.ntlm2.recv_arc4info, ctx->crypt.ntlm2.recv_seal_key, 16 ); + ctx->crypt.ntlm2.send_seq_no = 0; + ctx->crypt.ntlm2.recv_seq_no = 0; + } + +done: + if (status != SEC_E_OK && status != SEC_I_CONTINUE_NEEDED) ntlm_funcs->cleanup( ctx ); + free( username ); + free( domain ); + free( password ); + free( buf ); + free( bin ); + free( want_flags ); + + TRACE( "returning %08x\n", status ); + return status; +} + +static NTSTATUS NTAPI ntlm_SpDeleteContext( LSA_SEC_HANDLE handle ) +{ + struct ntlm_ctx *ctx = (struct ntlm_ctx *)handle; + + TRACE( "%lx\n", handle ); + + if (!ctx) return SEC_E_INVALID_HANDLE; + ntlm_funcs->cleanup( ctx ); + return SEC_E_OK; +} + static SECPKG_FUNCTION_TABLE ntlm_table = { ntlm_LsaApInitializePackage, @@ -302,9 +859,9 @@ static SECPKG_FUNCTION_TABLE ntlm_table = NULL, /* SaveCredentials */ NULL, /* GetCredentials */ NULL, /* DeleteCredentials */ - NULL, /* SpInitLsaModeContext */ + ntlm_SpInitLsaModeContext, NULL, /* SpAcceptLsaModeContext */ - NULL, /* SpDeleteContext */ + ntlm_SpDeleteContext, NULL, /* ApplyControlToken */ NULL, /* GetUserInfo */ NULL, /* GetExtendedInformation */ diff --git a/dlls/msv1_0/unixlib.c b/dlls/msv1_0/unixlib.c index 098b921e985..83975803aa2 100644 --- a/dlls/msv1_0/unixlib.c +++ b/dlls/msv1_0/unixlib.c @@ -41,6 +41,73 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntlm); WINE_DECLARE_DEBUG_CHANNEL(winediag); +#define INITIAL_BUFFER_SIZE 200 + +static SECURITY_STATUS read_line( struct ntlm_ctx *ctx, unsigned int *offset ) +{ + char *newline; + + if (!ctx->com_buf) + { + if (!(ctx->com_buf = RtlAllocateHeap( GetProcessHeap(), 0, INITIAL_BUFFER_SIZE ))) + return SEC_E_INSUFFICIENT_MEMORY; + ctx->com_buf_size = INITIAL_BUFFER_SIZE; + ctx->com_buf_offset = 0; + } + + do + { + ssize_t size; + if (ctx->com_buf_offset + INITIAL_BUFFER_SIZE > ctx->com_buf_size) + { + char *buf = RtlReAllocateHeap( GetProcessHeap(), 0, ctx->com_buf, ctx->com_buf_size + INITIAL_BUFFER_SIZE ); + if (!buf) return SEC_E_INSUFFICIENT_MEMORY; + ctx->com_buf_size += INITIAL_BUFFER_SIZE; + ctx->com_buf = buf; + } + size = read( ctx->pipe_in, ctx->com_buf + ctx->com_buf_offset, ctx->com_buf_size - ctx->com_buf_offset ); + if (size <= 0) return SEC_E_INTERNAL_ERROR; + + ctx->com_buf_offset += size; + newline = memchr( ctx->com_buf, '\n', ctx->com_buf_offset ); + } while (!newline); + + /* if there's a newline character, and we read more than that newline, we have to store the offset so we can + preserve the additional data */ + if (newline != ctx->com_buf + ctx->com_buf_offset) *offset = (ctx->com_buf + ctx->com_buf_offset) - (newline + 1); + else *offset = 0; + + *newline = 0; + return SEC_E_OK; +} + +static SECURITY_STATUS CDECL ntlm_chat( struct ntlm_ctx *ctx, char *buf, unsigned int buflen, unsigned int *retlen ) +{ + SECURITY_STATUS status = SEC_E_OK; + unsigned int offset; + + write( ctx->pipe_out, buf, strlen(buf) ); + write( ctx->pipe_out, "\n", 1 ); + + if ((status = read_line( ctx, &offset )) != SEC_E_OK) return status; + *retlen = strlen( ctx->com_buf ); + + if (*retlen > buflen) return SEC_E_BUFFER_TOO_SMALL; + if (*retlen < 2) return SEC_E_ILLEGAL_MESSAGE; + if (!strncmp( ctx->com_buf, "ERR", 3 )) return SEC_E_INVALID_TOKEN; + + memcpy( buf, ctx->com_buf, *retlen + 1 ); + + if (!offset) ctx->com_buf_offset = 0; + else + { + memmove( ctx->com_buf, ctx->com_buf + ctx->com_buf_offset, offset ); + ctx->com_buf_offset = offset; + } + + return SEC_E_OK; +} + static void CDECL ntlm_cleanup( struct ntlm_ctx *ctx ) { if (!ctx || (ctx->mode != MODE_CLIENT && ctx->mode != MODE_SERVER)) return; @@ -172,6 +239,7 @@ static BOOL check_version( void ) static const struct ntlm_funcs funcs = { + ntlm_chat, ntlm_cleanup, ntlm_fork, }; diff --git a/dlls/msv1_0/unixlib.h b/dlls/msv1_0/unixlib.h index c0dd4ca1456..3f88251848b 100644 --- a/dlls/msv1_0/unixlib.h +++ b/dlls/msv1_0/unixlib.h @@ -90,6 +90,7 @@ struct ntlm_ctx struct ntlm_funcs { + SECURITY_STATUS (CDECL *chat)( struct ntlm_ctx *, char *, unsigned int, unsigned int * ); void (CDECL *cleanup)( struct ntlm_ctx * ); SECURITY_STATUS (CDECL *fork)( char **, struct ntlm_ctx ** ); }; -- 2.30.2

1 0