- Wine-Devel - list.winehq.org

[PATCH] rtworkq: Use CRT allocation functions.
by Nikolay Sivov April 21, 2021

April 21, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/rtworkq/queue.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index 6817b06f284..58769a0be04 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -24,7 +24,6 @@ #include "initguid.h" #include "rtworkq.h" #include "wine/debug.h" -#include "wine/heap.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -220,7 +219,7 @@ static HRESULT unlock_user_queue(DWORD queue) { if (shared_mt_queue == queue) shared_mt_queue = 0; shutdown_queue((struct queue *)entry->obj); - heap_free(entry->obj); + free(entry->obj); entry->obj = next_free_user_queue; next_free_user_queue = entry; } @@ -555,7 +554,7 @@ static ULONG WINAPI work_item_Release(IUnknown *iface) if (item->reply_result) IRtwqAsyncResult_Release(item->reply_result); IRtwqAsyncResult_Release(item->result); - heap_free(item); + free(item); } return refcount; @@ -574,7 +573,7 @@ static struct work_item * alloc_work_item(struct queue *queue, LONG priority, IR DWORD flags = 0, queue_id = 0; struct work_item *item; - item = heap_alloc_zero(sizeof(*item)); + item = calloc(1, sizeof(*item)); item->IUnknown_iface.lpVtbl = &work_item_vtbl; item->result = result; @@ -898,8 +897,7 @@ static HRESULT alloc_user_queue(const struct queue_desc *desc, DWORD *queue_id) if (platform_lock <= 0) return RTWQ_E_SHUTDOWN; - queue = heap_alloc_zero(sizeof(*queue)); - if (!queue) + if (!(queue = calloc(1, sizeof(*queue)))) return E_OUTOFMEMORY; init_work_queue(desc, queue); @@ -914,7 +912,7 @@ static HRESULT alloc_user_queue(const struct queue_desc *desc, DWORD *queue_id) else { LeaveCriticalSection(&queues_section); - heap_free(queue); + free(queue); WARN("Out of user queue handles.\n"); return E_OUTOFMEMORY; } @@ -988,7 +986,7 @@ static ULONG WINAPI async_result_Release(IRtwqAsyncResult *iface) IUnknown_Release(result->state); if (result->result.hEvent) CloseHandle(result->result.hEvent); - heap_free(result); + free(result); RtwqUnlockPlatform(); } @@ -1074,8 +1072,7 @@ static HRESULT create_async_result(IUnknown *object, IRtwqAsyncCallback *callbac if (!out) return E_INVALIDARG; - result = heap_alloc_zero(sizeof(*result)); - if (!result) + if (!(result = calloc(1, sizeof(*result)))) return E_OUTOFMEMORY; RtwqLockPlatform(); @@ -1267,7 +1264,7 @@ static ULONG WINAPI periodic_callback_Release(IRtwqAsyncCallback *iface) TRACE("%p, %u.\n", iface, refcount); if (!refcount) - heap_free(callback); + free(callback); return refcount; } @@ -1306,8 +1303,7 @@ static HRESULT create_periodic_callback_obj(RTWQPERIODICCALLBACK callback, IRtwq { struct periodic_callback *object; - object = heap_alloc(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IRtwqAsyncCallback_iface.lpVtbl = &periodic_callback_vtbl; -- 2.30.2

1 0

[PATCH 1/8] mfplay: Handle user sinks.
by Nikolay Sivov April 21, 2021

April 21, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplay/player.c | 75 +++++++++++++++++++++++++++++++------------- 1 file changed, 53 insertions(+), 22 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 51f3f67f5b1..87ddf613288 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1015,13 +1015,38 @@ static HRESULT media_item_get_stream_type(IMFStreamDescriptor *sd, GUID *major) return hr; } +static HRESULT media_item_create_source_node(struct media_item *item, IMFStreamDescriptor *sd, + IMFTopologyNode **node) +{ + HRESULT hr; + + if (SUCCEEDED(hr = MFCreateTopologyNode(MF_TOPOLOGY_SOURCESTREAM_NODE, node))) + { + IMFTopologyNode_SetUnknown(*node, &MF_TOPONODE_SOURCE, (IUnknown *)item->source); + IMFTopologyNode_SetUnknown(*node, &MF_TOPONODE_PRESENTATION_DESCRIPTOR, (IUnknown *)item->pd); + IMFTopologyNode_SetUnknown(*node, &MF_TOPONODE_STREAM_DESCRIPTOR, (IUnknown *)sd); + } + + return hr; +} + +static HRESULT media_item_create_sink_node(IUnknown *sink, IMFTopologyNode **node) +{ + HRESULT hr; + + if (SUCCEEDED(hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, node))) + IMFTopologyNode_SetObject(*node, sink); + + return hr; +} + static HRESULT media_item_create_topology(struct media_player *player, struct media_item *item, IMFTopology **out) { IMFTopologyNode *src_node, *sink_node; - IMFActivate *sar_activate; IMFStreamDescriptor *sd; IMFTopology *topology; unsigned int idx; + IUnknown *sink; BOOL selected; HRESULT hr; GUID major; @@ -1029,48 +1054,54 @@ static HRESULT media_item_create_topology(struct media_player *player, struct me if (FAILED(hr = MFCreateTopology(&topology))) return hr; - /* FIXME: handle user sinks */ - /* Use first stream if none selected. */ if (player->output_window) { FIXME("Video streams are not handled.\n"); } - /* Set up audio branches for all selected streams. */ + /* Set up branches for all selected streams. */ idx = 0; while (SUCCEEDED(IMFPresentationDescriptor_GetStreamDescriptorByIndex(item->pd, idx++, &selected, &sd))) { - if (selected && SUCCEEDED(media_item_get_stream_type(sd, &major)) && IsEqualGUID(&major, &MFMediaType_Audio)) + if (!selected) { - if (SUCCEEDED(hr = MFCreateTopologyNode(MF_TOPOLOGY_SOURCESTREAM_NODE, &src_node))) - { - IMFTopologyNode_SetUnknown(src_node, &MF_TOPONODE_SOURCE, (IUnknown *)item->source); - IMFTopologyNode_SetUnknown(src_node, &MF_TOPONODE_PRESENTATION_DESCRIPTOR, (IUnknown *)item->pd); - IMFTopologyNode_SetUnknown(src_node, &MF_TOPONODE_STREAM_DESCRIPTOR, (IUnknown *)sd); + IMFStreamDescriptor_Release(sd); + continue; + } - IMFTopology_AddNode(topology, src_node); - } + sink = NULL; - if (SUCCEEDED(hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &sink_node))) - { - if (SUCCEEDED(MFCreateAudioRendererActivate(&sar_activate))) - { - IMFTopologyNode_SetObject(sink_node, (IUnknown *)sar_activate); - IMFActivate_Release(sar_activate); - } + if (SUCCEEDED(IMFStreamDescriptor_GetUnknown(sd, &_MF_CUSTOM_SINK, &IID_IUnknown, (void **)&sink))) + { + /* User sink is attached as-is. */ + } + else if (SUCCEEDED(media_item_get_stream_type(sd, &major)) && IsEqualGUID(&major, &MFMediaType_Audio)) + { + if (FAILED(hr = MFCreateAudioRendererActivate((IMFActivate **)&sink))) + WARN("Failed to create SAR activation object, hr %#x.\n", hr); + } - IMFTopology_AddNode(topology, sink_node); - } + if (sink) + { + hr = media_item_create_source_node(item, sd, &src_node); + if (SUCCEEDED(hr)) + hr = media_item_create_sink_node(sink, &sink_node); - if (src_node && sink_node) + if (SUCCEEDED(hr)) + { + IMFTopology_AddNode(topology, src_node); + IMFTopology_AddNode(topology, sink_node); IMFTopologyNode_ConnectOutput(src_node, 0, sink_node, 0); + } if (src_node) IMFTopologyNode_Release(src_node); if (sink_node) IMFTopologyNode_Release(sink_node); + + IUnknown_Release(sink); } IMFStreamDescriptor_Release(sd); -- 2.30.2

1 7

[PATCH v3] server: Track desktop users per thread instead of per process.
by Rémi Bernon April 21, 2021

April 21, 2021

As some thread may use a different desktop from their process. This fixes the user32 win tests, which leaks a desktop that never gets closed. The test_shell_window test creates a new desktop, which spawns explorer.exe process, incrementing the desktop user count to 1, then associates the desktop to a thread, which closes it on exit. Never the user count is incremented to 2, and closing the thread desktop doesn't either check whether the desktop process should be terminated. Reversely, it is possible to create a desktop, associate it with a thread /and/ a process, and this time the desktop process would be terminated when the process exits, although the thread may still be using it. Tracking the users per thread is more robust and fixes the problem as set_thread_desktop increments the desktop user count, and thread exit decrements it. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v3: Rename close_thread_desktop to release_thread_desktop, and add a close argument to only close and clear the handle on thread exit. When making a process system, only release the desktop user count, and don't touch the threads or the process desktop handles. Small cleanup on the clear_error() calls too, to only do them when get_desktop_obj failed. server/process.c | 6 ++-- server/thread.c | 15 ++++++++-- server/user.h | 3 +- server/winstation.c | 72 ++++++++++++++++++++++++++++----------------- 4 files changed, 64 insertions(+), 32 deletions(-) diff --git a/server/process.c b/server/process.c index 8ad5a59a20b..d819f03a615 100644 --- a/server/process.c +++ b/server/process.c @@ -841,7 +841,7 @@ static void process_killed( struct process *process ) assert( list_empty( &process->thread_list )); process->end_time = current_time; - if (!process->is_system) close_process_desktop( process ); + close_process_desktop( process ); process->winstation = 0; process->desktop = 0; cancel_process_asyncs( process ); @@ -1503,6 +1503,7 @@ DECL_HANDLER(get_process_idle_event) DECL_HANDLER(make_process_system) { struct process *process = current->process; + struct thread *thread; if (!shutdown_event) { @@ -1515,8 +1516,9 @@ DECL_HANDLER(make_process_system) if (!process->is_system) { + LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry ) + release_thread_desktop( thread, 0 ); process->is_system = 1; - close_process_desktop( process ); if (!--user_processes && !shutdown_stage && master_socket_timeout != TIMEOUT_INFINITE) shutdown_timeout = add_timeout_user( master_socket_timeout, server_shutdown_timeout, NULL ); } diff --git a/server/thread.c b/server/thread.c index fe9f9bdec37..66f1057d1db 100644 --- a/server/thread.c +++ b/server/thread.c @@ -306,6 +306,7 @@ static struct context *create_thread_context( struct thread *thread ) /* create a new thread */ struct thread *create_thread( int fd, struct process *process, const struct security_descriptor *sd ) { + struct desktop *desktop; struct thread *thread; int request_pipe[2]; @@ -342,7 +343,7 @@ struct thread *create_thread( int fd, struct process *process, const struct secu init_thread_structure( thread ); thread->process = (struct process *)grab_object( process ); - thread->desktop = process->desktop; + thread->desktop = 0; thread->affinity = process->affinity; if (!current) current = thread; @@ -369,6 +370,16 @@ struct thread *create_thread( int fd, struct process *process, const struct secu return NULL; } + if (process->desktop) + { + if (!(desktop = get_desktop_obj( process, process->desktop, 0 ))) clear_error(); /* ignore errors */ + else + { + set_thread_default_desktop( thread, desktop, process->desktop ); + release_object( desktop ); + } + } + set_fd_events( thread->request_fd, POLLIN ); /* start listening to events */ add_process_thread( thread->process, thread ); return thread; @@ -416,7 +427,7 @@ static void cleanup_thread( struct thread *thread ) cleanup_clipboard_thread(thread); destroy_thread_windows( thread ); free_msg_queue( thread ); - close_thread_desktop( thread ); + release_thread_desktop( thread, 1 ); for (i = 0; i < MAX_INFLIGHT_FDS; i++) { if (thread->inflight[i].client != -1) diff --git a/server/user.h b/server/user.h index 6267f3e2881..80f7e91f12c 100644 --- a/server/user.h +++ b/server/user.h @@ -188,7 +188,8 @@ extern void connect_process_winstation( struct process *process, struct thread * extern void set_process_default_desktop( struct process *process, struct desktop *desktop, obj_handle_t handle ); extern void close_process_desktop( struct process *process ); -extern void close_thread_desktop( struct thread *thread ); +extern void set_thread_default_desktop( struct thread *thread, struct desktop *desktop, obj_handle_t handle ); +extern void release_thread_desktop( struct thread *thread, int close ); static inline int is_rect_empty( const rectangle_t *rect ) { diff --git a/server/winstation.c b/server/winstation.c index 1c7552f0687..61f9f77c73f 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -324,15 +324,22 @@ static void add_desktop_user( struct desktop *desktop ) /* remove a user of the desktop and start the close timeout if necessary */ static void remove_desktop_user( struct desktop *desktop ) { + struct process *process; assert( desktop->users > 0 ); desktop->users--; /* if we have one remaining user, it has to be the manager of the desktop window */ - if (desktop->users == 1 && get_top_window_owner( desktop )) - { - assert( !desktop->close_timeout ); + if ((process = get_top_window_owner( desktop )) && desktop->users == process->running_threads && !desktop->close_timeout) desktop->close_timeout = add_timeout_user( -TICKS_PER_SEC, close_desktop_timeout, desktop ); - } +} + +/* set the thread default desktop handle */ +void set_thread_default_desktop( struct thread *thread, struct desktop *desktop, obj_handle_t handle ) +{ + if (thread->desktop) return; /* nothing to do */ + + thread->desktop = handle; + if (!thread->process->is_system) add_desktop_user( desktop ); } /* set the process default desktop handle */ @@ -340,24 +347,14 @@ void set_process_default_desktop( struct process *process, struct desktop *deskt obj_handle_t handle ) { struct thread *thread; - struct desktop *old_desktop; if (process->desktop == handle) return; /* nothing to do */ - if (!(old_desktop = get_desktop_obj( process, process->desktop, 0 ))) clear_error(); process->desktop = handle; /* set desktop for threads that don't have one yet */ LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry ) - if (!thread->desktop) thread->desktop = handle; - - if (!process->is_system && desktop != old_desktop) - { - add_desktop_user( desktop ); - if (old_desktop) remove_desktop_user( old_desktop ); - } - - if (old_desktop) release_object( old_desktop ); + set_thread_default_desktop( thread, desktop, handle ); } /* connect a process to its window station */ @@ -413,23 +410,37 @@ done: /* close the desktop of a given process */ void close_process_desktop( struct process *process ) { - struct desktop *desktop; + obj_handle_t handle; - if (process->desktop && (desktop = get_desktop_obj( process, process->desktop, 0 ))) - { - remove_desktop_user( desktop ); - release_object( desktop ); - } - clear_error(); /* ignore errors */ + if (!(handle = process->desktop)) return; + + process->desktop = 0; + close_handle( process, handle ); } -/* close the desktop of a given thread */ -void close_thread_desktop( struct thread *thread ) +/* release (and eventually close) the desktop of a given thread */ +void release_thread_desktop( struct thread *thread, int close ) { - obj_handle_t handle = thread->desktop; + struct desktop *desktop; + obj_handle_t handle; + + if (!(handle = thread->desktop)) return; + + if (!thread->process->is_system) + { + if (!(desktop = get_desktop_obj( thread->process, handle, 0 ))) clear_error(); /* ignore errors */ + else + { + remove_desktop_user( desktop ); + release_object( desktop ); + } + } - thread->desktop = 0; - if (handle) close_handle( thread->process, handle ); + if (close) + { + thread->desktop = 0; + close_handle( thread->process, handle ); + } } /* create a window station */ @@ -624,7 +635,14 @@ DECL_HANDLER(set_thread_desktop) if (old_desktop != new_desktop && current->desktop_users > 0) set_error( STATUS_DEVICE_BUSY ); else + { current->desktop = req->handle; /* FIXME: should we close the old one? */ + if (!current->process->is_system && old_desktop != new_desktop) + { + add_desktop_user( new_desktop ); + if (old_desktop) remove_desktop_user( old_desktop ); + } + } if (!current->process->desktop) set_process_default_desktop( current->process, new_desktop, req->handle ); -- 2.31.0

1 0

[PATCH] secur32/tests: Add a Kerberos ticket cache test.
by Hans Leidekker April 21, 2021

April 21, 2021

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/tests/secur32.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/secur32/tests/secur32.c b/dlls/secur32/tests/secur32.c index 8fd421ca732..f6bca55561c 100644 --- a/dlls/secur32/tests/secur32.c +++ b/dlls/secur32/tests/secur32.c @@ -29,6 +29,8 @@ #include <schannel.h> #include <wincred.h> #include <winsock2.h> +#include <ntsecapi.h> +#include <winternl.h> #include "wine/test.h" @@ -464,6 +466,38 @@ static void test_kerberos(void) FreeCredentialHandle( &cred ); } +static void test_ticket_cache(void) +{ + KERB_QUERY_TKT_CACHE_REQUEST req = { KerbQueryTicketCacheMessage }; + KERB_QUERY_TKT_CACHE_RESPONSE *resp; + NTSTATUS status; + HANDLE lsa; + ULONG package, len, i; + LSA_STRING name; + + status = LsaConnectUntrusted( &lsa ); + ok( !status, "got %08x\n", status ); + + RtlInitAnsiString( &name, MICROSOFT_KERBEROS_NAME_A ); + status = LsaLookupAuthenticationPackage( lsa, &name, &package ); + ok( !status, "got %08x\n", status ); + + status = LsaCallAuthenticationPackage( lsa, package, &req, sizeof(req), (void **)&resp, &len, &status ); + ok( !status, "got %08x\n", status ); + ok( resp->MessageType == KerbQueryTicketCacheMessage, "got %u\n", resp->MessageType ); + + for (i = 0; i < resp->CountOfTickets; i++) + { + KERB_TICKET_CACHE_INFO *info = &resp->Tickets[i]; + trace( "ServerName %s\n", wine_dbgstr_wn(info->ServerName.Buffer, info->ServerName.Length/sizeof(WCHAR)) ); + trace( "RealmName %s\n", wine_dbgstr_wn(info->RealmName.Buffer, info->RealmName.Length/sizeof(WCHAR)) ); + trace( "EncryptionType %08x\n", info->EncryptionType ); + trace( "TicketFlags %08x\n", info->TicketFlags ); + } + LsaFreeReturnBuffer( resp ); + LsaDeregisterLogonProcess( lsa ); +} + START_TEST(secur32) { secdll = LoadLibraryA("secur32.dll"); @@ -514,4 +548,5 @@ START_TEST(secur32) } test_kerberos(); + test_ticket_cache(); } -- 2.30.2

1 0

[PATCH 7/7] kerberos: Use CRT memory allocators.
by Hans Leidekker April 21, 2021

April 21, 2021

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/kerberos/krb5_ap.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 239d6a1bded..581fcb4a789 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -22,6 +22,7 @@ */ #include <stdarg.h> +#include <stdlib.h> #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -32,7 +33,7 @@ #include "ntsecapi.h" #include "ntsecpkg.h" #include "winternl.h" -#include "wine/heap.h" + #include "wine/debug.h" #include "unixlib.h" @@ -267,7 +268,7 @@ static char *get_str_unixcp( const UNICODE_STRING *str ) { char *ret; int len = WideCharToMultiByte( CP_UNIXCP, 0, str->Buffer, str->Length / sizeof(WCHAR), NULL, 0, NULL, NULL ); - if (!(ret = heap_alloc( len + 1 ))) return NULL; + if (!(ret = malloc( len + 1 ))) return NULL; WideCharToMultiByte( CP_UNIXCP, 0, str->Buffer, str->Length / sizeof(WCHAR), ret, len, NULL, NULL ); ret[len] = 0; return ret; @@ -280,7 +281,7 @@ static char *get_username_unixcp( const WCHAR *user, ULONG user_len, const WCHAR len_user = WideCharToMultiByte( CP_UNIXCP, 0, user, user_len, NULL, 0, NULL, NULL ); len_domain = WideCharToMultiByte( CP_UNIXCP, 0, domain, domain_len, NULL, 0, NULL, NULL ); - if (!(ret = heap_alloc( len_user + len_domain + 2 ))) return NULL; + if (!(ret = malloc( len_user + len_domain + 2 ))) return NULL; WideCharToMultiByte( CP_UNIXCP, 0, user, user_len, ret, len_user, NULL, NULL ); ret[len_user] = '@'; @@ -295,7 +296,7 @@ static char *get_password_unixcp( const WCHAR *passwd, ULONG passwd_len ) char *ret; len = WideCharToMultiByte( CP_UNIXCP, WC_NO_BEST_FIT_CHARS, passwd, passwd_len, NULL, 0, NULL, NULL ); - if (!(ret = heap_alloc( len + 1 ))) return NULL; + if (!(ret = malloc( len + 1 ))) return NULL; WideCharToMultiByte( CP_UNIXCP, 0, passwd, passwd_len, ret, len, NULL, NULL ); ret[len] = 0; return ret; @@ -328,9 +329,9 @@ static NTSTATUS NTAPI kerberos_SpAcquireCredentialsHandle( status = krb5_funcs->acquire_credentials_handle( principal, credential_use, username, password, credential, expiry ); done: - heap_free( principal ); - heap_free( username ); - heap_free( password ); + free( principal ); + free( username ); + free( password ); return status; } @@ -364,7 +365,7 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, context_attr, expiry ); if (!status) *mapped_context = TRUE; /* FIXME: initialize context_data */ - heap_free( target ); + free( target ); return status; } @@ -399,7 +400,7 @@ static SecPkgInfoW *build_package_info( const SecPkgInfoW *info ) DWORD size_name = (wcslen(info->Name) + 1) * sizeof(WCHAR); DWORD size_comment = (wcslen(info->Comment) + 1) * sizeof(WCHAR); - if (!(ret = heap_alloc( sizeof(*ret) + size_name + size_comment ))) return NULL; + if (!(ret = malloc( sizeof(*ret) + size_name + size_comment ))) return NULL; ret->fCapabilities = info->fCapabilities; ret->wVersion = info->wVersion; ret->wRPCID = info->wRPCID; -- 2.30.2

1 0

[PATCH 6/7] kerberos: Use wide character string literals.
by Hans Leidekker April 21, 2021

April 21, 2021

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/kerberos/krb5_ap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 6e3135a9f02..239d6a1bded 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -61,8 +61,8 @@ const struct krb5_funcs *krb5_funcs = NULL; | SECPKG_FLAG_RESTRICTED_TOKENS \ | SECPKG_FLAG_APPCONTAINER_CHECKS) -static WCHAR kerberos_name_W[] = {'K','e','r','b','e','r','o','s',0}; -static WCHAR kerberos_comment_W[] = {'M','i','c','r','o','s','o','f','t',' ','K','e','r','b','e','r','o','s',' ','V','1','.','0',0}; +static WCHAR kerberos_name_W[] = L"Kerberos"; +static WCHAR kerberos_comment_W[] = L"Microsoft Kerberos V1.0"; static const SecPkgInfoW infoW = { KERBEROS_CAPS, -- 2.30.2

1 0

[PATCH 5/7] kerberos: Build with msvcrt.
by Hans Leidekker April 21, 2021

April 21, 2021

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/kerberos/Makefile.in | 2 ++ dlls/kerberos/krb5_ap.c | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/kerberos/Makefile.in b/dlls/kerberos/Makefile.in index ab5e6b59976..acfd9030955 100644 --- a/dlls/kerberos/Makefile.in +++ b/dlls/kerberos/Makefile.in @@ -1,6 +1,8 @@ MODULE = kerberos.dll EXTRAINCL = $(KRB5_CFLAGS) $(GSSAPI_CFLAGS) +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ krb5_ap.c \ unixlib.c diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 792ee974983..6e3135a9f02 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -34,7 +34,6 @@ #include "winternl.h" #include "wine/heap.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "unixlib.h" WINE_DEFAULT_DEBUG_CHANNEL(kerberos); @@ -397,8 +396,8 @@ static NTSTATUS NTAPI kerberos_SpDeleteContext( LSA_SEC_HANDLE context ) static SecPkgInfoW *build_package_info( const SecPkgInfoW *info ) { SecPkgInfoW *ret; - DWORD size_name = (strlenW(info->Name) + 1) * sizeof(WCHAR); - DWORD size_comment = (strlenW(info->Comment) + 1) * sizeof(WCHAR); + DWORD size_name = (wcslen(info->Name) + 1) * sizeof(WCHAR); + DWORD size_comment = (wcslen(info->Comment) + 1) * sizeof(WCHAR); if (!(ret = heap_alloc( sizeof(*ret) + size_name + size_comment ))) return NULL; ret->fCapabilities = info->fCapabilities; -- 2.30.2

1 0

[PATCH 4/7] kerberos: Move support for KerbQueryTicketCacheMessage to the Unix library.
by Hans Leidekker April 21, 2021

April 21, 2021

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/kerberos/krb5_ap.c | 428 +++++----------------------------------- dlls/kerberos/unixlib.c | 164 +++++++++++++++ dlls/kerberos/unixlib.h | 8 + 3 files changed, 219 insertions(+), 381 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 8ed4ffd13cf..792ee974983 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -21,18 +21,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> -#ifdef HAVE_KRB5_KRB5_H -#include <krb5/krb5.h> -#endif -#ifdef SONAME_LIBGSSAPI_KRB5 -# include <gssapi/gssapi.h> -# include <gssapi/gssapi_ext.h> -#endif - #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -88,94 +77,6 @@ static const SecPkgInfoW infoW = static ULONG kerberos_package_id; static LSA_DISPATCH_TABLE lsa_dispatch; -#ifdef SONAME_LIBKRB5 - -static void *libkrb5_handle; - -#define MAKE_FUNCPTR(f) static typeof(f) * p_##f -MAKE_FUNCPTR(krb5_cc_close); -MAKE_FUNCPTR(krb5_cc_default); -MAKE_FUNCPTR(krb5_cc_end_seq_get); -MAKE_FUNCPTR(krb5_cc_initialize); -MAKE_FUNCPTR(krb5_cc_next_cred); -MAKE_FUNCPTR(krb5_cc_start_seq_get); -MAKE_FUNCPTR(krb5_cc_store_cred); -MAKE_FUNCPTR(krb5_cccol_cursor_free); -MAKE_FUNCPTR(krb5_cccol_cursor_new); -MAKE_FUNCPTR(krb5_cccol_cursor_next); -MAKE_FUNCPTR(krb5_decode_ticket); -MAKE_FUNCPTR(krb5_free_context); -MAKE_FUNCPTR(krb5_free_cred_contents); -MAKE_FUNCPTR(krb5_free_principal); -MAKE_FUNCPTR(krb5_free_ticket); -MAKE_FUNCPTR(krb5_free_unparsed_name); -MAKE_FUNCPTR(krb5_get_init_creds_opt_alloc); -MAKE_FUNCPTR(krb5_get_init_creds_opt_free); -MAKE_FUNCPTR(krb5_get_init_creds_opt_set_out_ccache); -MAKE_FUNCPTR(krb5_get_init_creds_password); -MAKE_FUNCPTR(krb5_init_context); -MAKE_FUNCPTR(krb5_is_config_principal); -MAKE_FUNCPTR(krb5_parse_name_flags); -MAKE_FUNCPTR(krb5_unparse_name_flags); -#undef MAKE_FUNCPTR - -static void load_krb5(void) -{ - if (!(libkrb5_handle = dlopen(SONAME_LIBKRB5, RTLD_NOW))) - { - WARN("Failed to load %s, Kerberos support will be disabled\n", SONAME_LIBKRB5); - return; - } - -#define LOAD_FUNCPTR(f) \ - if (!(p_##f = dlsym(libkrb5_handle, #f))) \ - { \ - ERR("Failed to load %s\n", #f); \ - goto fail; \ - } - - LOAD_FUNCPTR(krb5_cc_close) - LOAD_FUNCPTR(krb5_cc_default) - LOAD_FUNCPTR(krb5_cc_end_seq_get) - LOAD_FUNCPTR(krb5_cc_initialize) - LOAD_FUNCPTR(krb5_cc_next_cred) - LOAD_FUNCPTR(krb5_cc_start_seq_get) - LOAD_FUNCPTR(krb5_cc_store_cred) - LOAD_FUNCPTR(krb5_cccol_cursor_free) - LOAD_FUNCPTR(krb5_cccol_cursor_new) - LOAD_FUNCPTR(krb5_cccol_cursor_next) - LOAD_FUNCPTR(krb5_decode_ticket) - LOAD_FUNCPTR(krb5_free_context) - LOAD_FUNCPTR(krb5_free_cred_contents) - LOAD_FUNCPTR(krb5_free_principal) - LOAD_FUNCPTR(krb5_free_ticket) - LOAD_FUNCPTR(krb5_free_unparsed_name) - LOAD_FUNCPTR(krb5_get_init_creds_opt_alloc) - LOAD_FUNCPTR(krb5_get_init_creds_opt_free) - LOAD_FUNCPTR(krb5_get_init_creds_opt_set_out_ccache) - LOAD_FUNCPTR(krb5_get_init_creds_password) - LOAD_FUNCPTR(krb5_init_context) - LOAD_FUNCPTR(krb5_is_config_principal) - LOAD_FUNCPTR(krb5_parse_name_flags) - LOAD_FUNCPTR(krb5_unparse_name_flags) -#undef LOAD_FUNCPTR - - return; - -fail: - dlclose(libkrb5_handle); - libkrb5_handle = NULL; -} - -#else /* SONAME_LIBKRB5 */ - -static void load_krb5(void) -{ - WARN("Kerberos support was not provided at compile time\n"); -} - -#endif /* SONAME_LIBKRB5 */ - static const char *debugstr_us( const UNICODE_STRING *us ) { if (!us) return "<null>"; @@ -187,7 +88,8 @@ static NTSTATUS NTAPI kerberos_LsaApInitializePackage(ULONG package_id, PLSA_DIS { char *kerberos_name; - load_krb5(); + if (!krb5_funcs && __wine_init_unix_lib( instance, DLL_PROCESS_ATTACH, NULL, &krb5_funcs )) + ERR( "no Kerberos support, expect problems\n" ); kerberos_package_id = package_id; lsa_dispatch = *dispatch; @@ -209,179 +111,15 @@ static NTSTATUS NTAPI kerberos_LsaApInitializePackage(ULONG package_id, PLSA_DIS return STATUS_SUCCESS; } -#ifdef SONAME_LIBKRB5 - -struct ticket_info -{ - ULONG count, allocated; - KERB_TICKET_CACHE_INFO *info; -}; - -static NTSTATUS krb5_error_to_status(krb5_error_code error) -{ - switch (error) - { - case 0: return STATUS_SUCCESS; - default: - /* FIXME */ - return STATUS_UNSUCCESSFUL; - } -} - -static void free_ticket_info(struct ticket_info *info) +static void free_ticket_list( struct ticket_list *list ) { ULONG i; - - for (i = 0; i < info->count; i++) + for (i = 0; i < list->count; i++) { - heap_free(info->info[i].RealmName.Buffer); - heap_free(info->info[i].ServerName.Buffer); + RtlFreeHeap( GetProcessHeap(), 0, list->tickets[i].RealmName.Buffer ); + RtlFreeHeap( GetProcessHeap(), 0, list->tickets[i].ServerName.Buffer ); } - - heap_free(info->info); -} - -static WCHAR *utf8_to_wstr(const char *utf8) -{ - int len; - WCHAR *wstr; - - len = MultiByteToWideChar(CP_UTF8, 0, utf8, -1, NULL, 0); - wstr = heap_alloc(len * sizeof(WCHAR)); - if (wstr) - MultiByteToWideChar(CP_UTF8, 0, utf8, -1, wstr, len); - - return wstr; -} - -static NTSTATUS copy_tickets_from_cache(krb5_context context, krb5_ccache cache, struct ticket_info *info) -{ - NTSTATUS status; - krb5_cc_cursor cursor; - krb5_error_code error; - krb5_creds credentials; - krb5_ticket *ticket; - char *name_with_realm, *name_without_realm, *realm_name; - WCHAR *realm_nameW, *name_without_realmW; - - error = p_krb5_cc_start_seq_get(context, cache, &cursor); - if (error) return krb5_error_to_status(error); - - for (;;) - { - error = p_krb5_cc_next_cred(context, cache, &cursor, &credentials); - if (error) - { - if (error == KRB5_CC_END) - status = STATUS_SUCCESS; - else - status = krb5_error_to_status(error); - break; - } - - if (p_krb5_is_config_principal(context, credentials.server)) - { - p_krb5_free_cred_contents(context, &credentials); - continue; - } - - if (info->count == info->allocated) - { - KERB_TICKET_CACHE_INFO *new_info; - ULONG new_allocated; - - if (info->allocated) - { - new_allocated = info->allocated * 2; - new_info = heap_realloc(info->info, sizeof(*new_info) * new_allocated); - } - else - { - new_allocated = 16; - new_info = heap_alloc(sizeof(*new_info) * new_allocated); - } - if (!new_info) - { - p_krb5_free_cred_contents(context, &credentials); - status = STATUS_NO_MEMORY; - break; - } - - info->info = new_info; - info->allocated = new_allocated; - } - - error = p_krb5_unparse_name_flags(context, credentials.server, 0, &name_with_realm); - if (error) - { - p_krb5_free_cred_contents(context, &credentials); - status = krb5_error_to_status(error); - break; - } - - TRACE("name_with_realm: %s\n", debugstr_a(name_with_realm)); - - error = p_krb5_unparse_name_flags(context, credentials.server, - KRB5_PRINCIPAL_UNPARSE_NO_REALM, &name_without_realm); - if (error) - { - p_krb5_free_unparsed_name(context, name_with_realm); - p_krb5_free_cred_contents(context, &credentials); - status = krb5_error_to_status(error); - break; - } - - TRACE("name_without_realm: %s\n", debugstr_a(name_without_realm)); - - name_without_realmW = utf8_to_wstr(name_without_realm); - RtlInitUnicodeString(&info->info[info->count].ServerName, name_without_realmW); - - realm_name = strchr(name_with_realm, '@'); - if (!realm_name) - { - ERR("wrong name with realm %s\n", debugstr_a(name_with_realm)); - realm_name = name_with_realm; - } - else - realm_name++; - - /* realm_name - now contains only realm! */ - - realm_nameW = utf8_to_wstr(realm_name); - RtlInitUnicodeString(&info->info[info->count].RealmName, realm_nameW); - - if (!credentials.times.starttime) - credentials.times.starttime = credentials.times.authtime; - - /* TODO: if krb5_is_config_principal = true */ - RtlSecondsSince1970ToTime(credentials.times.starttime, &info->info[info->count].StartTime); - RtlSecondsSince1970ToTime(credentials.times.endtime, &info->info[info->count].EndTime); - RtlSecondsSince1970ToTime(credentials.times.renew_till, &info->info[info->count].RenewTime); - - info->info[info->count].TicketFlags = credentials.ticket_flags; - - error = p_krb5_decode_ticket(&credentials.ticket, &ticket); - - p_krb5_free_unparsed_name(context, name_with_realm); - p_krb5_free_unparsed_name(context, name_without_realm); - p_krb5_free_cred_contents(context, &credentials); - - if (error) - { - status = krb5_error_to_status(error); - break; - } - - info->info[info->count].EncryptionType = ticket->enc_part.enctype; - - p_krb5_free_ticket(context, ticket); - - info->count++; - } - - p_krb5_cc_end_seq_get(context, cache, &cursor); - - return status; + RtlFreeHeap( GetProcessHeap(), 0, list->tickets ); } static inline void init_client_us(UNICODE_STRING *dst, void *client_ws, const UNICODE_STRING *src) @@ -391,7 +129,7 @@ static inline void init_client_us(UNICODE_STRING *dst, void *client_ws, const UN dst->MaximumLength = src->MaximumLength; } -static NTSTATUS copy_to_client(PLSA_CLIENT_REQUEST lsa_req, struct ticket_info *info, void **out, ULONG *out_size) +static NTSTATUS copy_to_client(PLSA_CLIENT_REQUEST lsa_req, struct ticket_list *list, void **out, ULONG *out_size) { NTSTATUS status; ULONG i; @@ -399,28 +137,26 @@ static NTSTATUS copy_to_client(PLSA_CLIENT_REQUEST lsa_req, struct ticket_info * char *client_resp, *client_ticket, *client_str; KERB_QUERY_TKT_CACHE_RESPONSE resp; - size = sizeof(KERB_QUERY_TKT_CACHE_RESPONSE); - if (info->count != 0) - size += (info->count - 1) * sizeof(KERB_TICKET_CACHE_INFO); - + size = sizeof(resp); + if (list->count) size += (list->count - 1) * sizeof(KERB_TICKET_CACHE_INFO); client_str_off = size; - for (i = 0; i < info->count; i++) + for (i = 0; i < list->count; i++) { - size += info->info[i].RealmName.MaximumLength; - size += info->info[i].ServerName.MaximumLength; + size += list->tickets[i].RealmName.MaximumLength; + size += list->tickets[i].ServerName.MaximumLength; } status = lsa_dispatch.AllocateClientBuffer(lsa_req, size, (void **)&client_resp); if (status != STATUS_SUCCESS) return status; resp.MessageType = KerbQueryTicketCacheMessage; - resp.CountOfTickets = info->count; + resp.CountOfTickets = list->count; size = FIELD_OFFSET(KERB_QUERY_TKT_CACHE_RESPONSE, Tickets); status = lsa_dispatch.CopyToClientBuffer(lsa_req, size, client_resp, &resp); if (status != STATUS_SUCCESS) goto fail; - if (!info->count) + if (!list->count) { *out = client_resp; *out_size = sizeof(resp); @@ -432,24 +168,22 @@ static NTSTATUS copy_to_client(PLSA_CLIENT_REQUEST lsa_req, struct ticket_info * client_ticket = client_resp + size; client_str = client_resp + client_str_off; - for (i = 0; i < info->count; i++) + for (i = 0; i < list->count; i++) { - KERB_TICKET_CACHE_INFO ticket; - - ticket = info->info[i]; + KERB_TICKET_CACHE_INFO ticket = list->tickets[i]; - init_client_us(&ticket.RealmName, client_str, &info->info[i].RealmName); + init_client_us(&ticket.RealmName, client_str, &list->tickets[i].RealmName); - size = info->info[i].RealmName.MaximumLength; - status = lsa_dispatch.CopyToClientBuffer(lsa_req, size, client_str, info->info[i].RealmName.Buffer); + size = ticket.RealmName.MaximumLength; + status = lsa_dispatch.CopyToClientBuffer(lsa_req, size, client_str, list->tickets[i].RealmName.Buffer); if (status != STATUS_SUCCESS) goto fail; client_str += size; *out_size += size; - init_client_us(&ticket.ServerName, client_str, &info->info[i].ServerName); + init_client_us(&ticket.ServerName, client_str, &list->tickets[i].ServerName); - size = info->info[i].ServerName.MaximumLength; - status = lsa_dispatch.CopyToClientBuffer(lsa_req, size, client_str, info->info[i].ServerName.Buffer); + size = ticket.ServerName.MaximumLength; + status = lsa_dispatch.CopyToClientBuffer(lsa_req, size, client_str, list->tickets[i].ServerName.Buffer); if (status != STATUS_SUCCESS) goto fail; client_str += size; *out_size += size; @@ -469,121 +203,53 @@ fail: return status; } -static NTSTATUS query_ticket_cache(PLSA_CLIENT_REQUEST lsa_req, void *in, ULONG in_len, void **out, ULONG *out_len) +static NTSTATUS NTAPI kerberos_LsaApCallPackageUntrusted(PLSA_CLIENT_REQUEST req, void *in_buf, + void *client_buf_base, ULONG in_buf_len, void **out_buf, ULONG *out_buf_len, NTSTATUS *ret_status) { - NTSTATUS status; - KERB_QUERY_TKT_CACHE_REQUEST *query; - struct ticket_info info; - krb5_error_code error; - krb5_context context = NULL; - krb5_cccol_cursor cursor = NULL; - krb5_ccache cache; - - if (!in || in_len != sizeof(KERB_QUERY_TKT_CACHE_REQUEST) || !out || !out_len) - return STATUS_INVALID_PARAMETER; - - query = (KERB_QUERY_TKT_CACHE_REQUEST *)in; + KERB_PROTOCOL_MESSAGE_TYPE msg; - if (query->LogonId.HighPart != 0 || query->LogonId.LowPart != 0) - return STATUS_ACCESS_DENIED; + TRACE("%p,%p,%p,%u,%p,%p,%p\n", req, in_buf, client_buf_base, in_buf_len, out_buf, out_buf_len, ret_status); - info.count = 0; - info.allocated = 0; - info.info = NULL; + if (!in_buf || in_buf_len < sizeof(msg)) return STATUS_INVALID_PARAMETER; - error = p_krb5_init_context(&context); - if (error) + msg = *(KERB_PROTOCOL_MESSAGE_TYPE *)in_buf; + switch (msg) { - status = krb5_error_to_status(error); - goto done; - } - - error = p_krb5_cccol_cursor_new(context, &cursor); - if (error) + case KerbQueryTicketCacheMessage: { - status = krb5_error_to_status(error); - goto done; - } + KERB_QUERY_TKT_CACHE_REQUEST *query = (KERB_QUERY_TKT_CACHE_REQUEST *)in_buf; + struct ticket_list list; + NTSTATUS status; - for (;;) - { - error = p_krb5_cccol_cursor_next(context, cursor, &cache); - if (error) + if (!in_buf || in_buf_len != sizeof(*query) || !out_buf || !out_buf_len) return STATUS_INVALID_PARAMETER; + if (query->LogonId.HighPart || query->LogonId.LowPart) return STATUS_ACCESS_DENIED; + + status = krb5_funcs->query_ticket_cache(&list); + if (!status) { - status = krb5_error_to_status(error); - goto done; + status = copy_to_client(req, &list, out_buf, out_buf_len); + free_ticket_list(&list); } - if (!cache) break; - - status = copy_tickets_from_cache(context, cache, &info); - - p_krb5_cc_close(context, cache); - - if (status != STATUS_SUCCESS) - goto done; - } - - status = copy_to_client(lsa_req, &info, out, out_len); - -done: - if (cursor) - p_krb5_cccol_cursor_free(context, &cursor); - - if (context) - p_krb5_free_context(context); - - free_ticket_info(&info); - - return status; -} - -#else /* SONAME_LIBKRB5 */ - -static NTSTATUS query_ticket_cache(PLSA_CLIENT_REQUEST lsa_req, void *in, ULONG in_len, void **out, ULONG *out_len) -{ - FIXME("%p,%p,%u,%p,%p: stub\n", lsa_req, in, in_len, out, out_len); - return STATUS_NOT_IMPLEMENTED; -} - -#endif /* SONAME_LIBKRB5 */ - -static NTSTATUS NTAPI kerberos_LsaApCallPackageUntrusted(PLSA_CLIENT_REQUEST request, - PVOID in_buffer, PVOID client_buffer_base, ULONG in_buffer_length, - PVOID *out_buffer, PULONG out_buffer_length, PNTSTATUS status) -{ - KERB_PROTOCOL_MESSAGE_TYPE msg; - - TRACE("%p,%p,%p,%u,%p,%p,%p\n", request, in_buffer, client_buffer_base, - in_buffer_length, out_buffer, out_buffer_length, status); - - if (!in_buffer || in_buffer_length < sizeof(msg)) - return STATUS_INVALID_PARAMETER; - - msg = *(KERB_PROTOCOL_MESSAGE_TYPE *)in_buffer; - - switch (msg) - { - case KerbQueryTicketCacheMessage: - *status = query_ticket_cache(request, in_buffer, in_buffer_length, out_buffer, out_buffer_length); + *ret_status = status; break; - + } case KerbRetrieveTicketMessage: FIXME("KerbRetrieveTicketMessage stub\n"); - *status = STATUS_NOT_IMPLEMENTED; + *ret_status = STATUS_NOT_IMPLEMENTED; break; case KerbPurgeTicketCacheMessage: FIXME("KerbPurgeTicketCacheMessage stub\n"); - *status = STATUS_NOT_IMPLEMENTED; + *ret_status = STATUS_NOT_IMPLEMENTED; break; default: /* All other requests should call LsaApCallPackage */ WARN("%u => access denied\n", msg); - *status = STATUS_ACCESS_DENIED; + *ret_status = STATUS_ACCESS_DENIED; break; } - return *status; + return *ret_status; } static NTSTATUS NTAPI kerberos_SpGetInfo(SecPkgInfoW *info) diff --git a/dlls/kerberos/unixlib.c b/dlls/kerberos/unixlib.c index 4e9b90eeccf..6f53609e2ed 100644 --- a/dlls/kerberos/unixlib.c +++ b/dlls/kerberos/unixlib.c @@ -148,6 +148,169 @@ static NTSTATUS krb5_error_to_status( krb5_error_code err ) } } +static WCHAR *utf8_to_wstr( const char *src ) +{ + ULONG dstlen, srclen = strlen( src ) + 1; + WCHAR *dst; + + RtlUTF8ToUnicodeN( NULL, 0, &dstlen, src, srclen ); + if ((dst = RtlAllocateHeap( GetProcessHeap(), 0, dstlen ))) + RtlUTF8ToUnicodeN( dst, dstlen, &dstlen, src, srclen ); + return dst; +} + +static NTSTATUS copy_tickets_from_cache( krb5_context ctx, krb5_ccache cache, struct ticket_list *list ) +{ + NTSTATUS status; + krb5_cc_cursor cursor; + krb5_error_code err; + krb5_creds creds; + krb5_ticket *ticket; + char *name_with_realm, *name_without_realm, *realm_name; + WCHAR *realm_nameW, *name_without_realmW; + + if ((err = p_krb5_cc_start_seq_get( ctx, cache, &cursor ))) return krb5_error_to_status( err ); + for (;;) + { + if ((err = p_krb5_cc_next_cred( ctx, cache, &cursor, &creds ))) + { + if (err == KRB5_CC_END) + status = STATUS_SUCCESS; + else + status = krb5_error_to_status( err ); + break; + } + + if (p_krb5_is_config_principal( ctx, creds.server )) + { + p_krb5_free_cred_contents( ctx, &creds ); + continue; + } + + if (list->count == list->allocated) + { + KERB_TICKET_CACHE_INFO *new_tickets; + ULONG new_allocated; + + if (list->allocated) + { + new_allocated = list->allocated * 2; + new_tickets = RtlReAllocateHeap( GetProcessHeap(), 0, list->tickets, sizeof(*new_tickets) * new_allocated ); + } + else + { + new_allocated = 16; + new_tickets = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*new_tickets) * new_allocated ); + } + if (!new_tickets) + { + p_krb5_free_cred_contents( ctx, &creds ); + status = STATUS_NO_MEMORY; + break; + } + list->tickets = new_tickets; + list->allocated = new_allocated; + } + + if ((err = p_krb5_unparse_name_flags( ctx, creds.server, 0, &name_with_realm ))) + { + p_krb5_free_cred_contents( ctx, &creds ); + status = krb5_error_to_status( err ); + break; + } + TRACE( "name_with_realm: %s\n", debugstr_a(name_with_realm) ); + + if ((err = p_krb5_unparse_name_flags( ctx, creds.server, KRB5_PRINCIPAL_UNPARSE_NO_REALM, + &name_without_realm ))) + { + p_krb5_free_unparsed_name( ctx, name_with_realm ); + p_krb5_free_cred_contents( ctx, &creds ); + status = krb5_error_to_status( err ); + break; + } + TRACE( "name_without_realm: %s\n", debugstr_a(name_without_realm) ); + + name_without_realmW = utf8_to_wstr( name_without_realm ); + RtlInitUnicodeString( &list->tickets[list->count].ServerName, name_without_realmW ); + + if (!(realm_name = strchr( name_with_realm, '@' ))) + { + ERR( "wrong name with realm %s\n", debugstr_a(name_with_realm) ); + realm_name = name_with_realm; + } + else realm_name++; + + /* realm_name - now contains only realm! */ + realm_nameW = utf8_to_wstr( realm_name ); + RtlInitUnicodeString( &list->tickets[list->count].RealmName, realm_nameW ); + + if (!creds.times.starttime) creds.times.starttime = creds.times.authtime; + + /* TODO: if krb5_is_config_principal = true */ + RtlSecondsSince1970ToTime( creds.times.starttime, &list->tickets[list->count].StartTime ); + RtlSecondsSince1970ToTime( creds.times.endtime, &list->tickets[list->count].EndTime ); + RtlSecondsSince1970ToTime( creds.times.renew_till, &list->tickets[list->count].RenewTime ); + + list->tickets[list->count].TicketFlags = creds.ticket_flags; + + err = p_krb5_decode_ticket( &creds.ticket, &ticket ); + p_krb5_free_unparsed_name( ctx, name_with_realm ); + p_krb5_free_unparsed_name( ctx, name_without_realm ); + p_krb5_free_cred_contents( ctx, &creds ); + if (err) + { + status = krb5_error_to_status( err ); + break; + } + + list->tickets[list->count].EncryptionType = ticket->enc_part.enctype; + p_krb5_free_ticket( ctx, ticket ); + list->count++; + } + + p_krb5_cc_end_seq_get( ctx, cache, &cursor ); + return status; +} + +static NTSTATUS CDECL query_ticket_cache( struct ticket_list *list ) +{ + NTSTATUS status; + krb5_error_code err; + krb5_context ctx; + krb5_cccol_cursor cursor = NULL; + krb5_ccache cache; + + list->count = 0; + list->allocated = 0; + list->tickets = NULL; + + if ((err = p_krb5_init_context( &ctx ))) return krb5_error_to_status( err ); + if ((err = p_krb5_cccol_cursor_new( ctx, &cursor ))) + { + status = krb5_error_to_status( err ); + goto done; + } + + for (;;) + { + if ((err = p_krb5_cccol_cursor_next( ctx, cursor, &cache ))) + { + status = krb5_error_to_status( err ); + goto done; + } + if (!cache) break; + + status = copy_tickets_from_cache( ctx, cache, list ); + p_krb5_cc_close( ctx, cache ); + if (status != STATUS_SUCCESS) goto done; + } + +done: + if (cursor) p_krb5_cccol_cursor_free( ctx, &cursor ); + if (ctx) p_krb5_free_context( ctx ); + return status; +} + static void *libgssapi_krb5_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f @@ -841,6 +1004,7 @@ static const struct krb5_funcs funcs = initialize_context, make_signature, query_context_attributes, + query_ticket_cache, seal_message, unseal_message, verify_signature, diff --git a/dlls/kerberos/unixlib.h b/dlls/kerberos/unixlib.h index 652a6e4f300..da36c59a680 100644 --- a/dlls/kerberos/unixlib.h +++ b/dlls/kerberos/unixlib.h @@ -21,6 +21,13 @@ #define KERBEROS_MAX_BUF 12000 +struct ticket_list +{ + ULONG count; + ULONG allocated; + KERB_TICKET_CACHE_INFO *tickets; +}; + struct krb5_funcs { NTSTATUS (CDECL *accept_context)(LSA_SEC_HANDLE, LSA_SEC_HANDLE, SecBufferDesc *, LSA_SEC_HANDLE *, @@ -33,6 +40,7 @@ struct krb5_funcs LSA_SEC_HANDLE *, SecBufferDesc *, ULONG *, TimeStamp *); NTSTATUS (CDECL *make_signature)(LSA_SEC_HANDLE, SecBufferDesc *); NTSTATUS (CDECL *query_context_attributes)(LSA_SEC_HANDLE, ULONG, void *); + NTSTATUS (CDECL *query_ticket_cache)(struct ticket_list *); NTSTATUS (CDECL *seal_message)(LSA_SEC_HANDLE, SecBufferDesc *, ULONG); NTSTATUS (CDECL *unseal_message)(LSA_SEC_HANDLE, SecBufferDesc *, ULONG *); NTSTATUS (CDECL *verify_signature)(LSA_SEC_HANDLE, SecBufferDesc *, ULONG *); -- 2.30.2

1 0

[PATCH 3/7] kerberos: Move support for SpUnsealMessage to the Unix library.
by Hans Leidekker April 21, 2021

April 21, 2021

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/kerberos/krb5_ap.c | 248 +--------------------------------------- dlls/kerberos/unixlib.c | 76 ++++++++++++ dlls/kerberos/unixlib.h | 1 + 3 files changed, 78 insertions(+), 247 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index d248c4e1951..8ed4ffd13cf 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -54,8 +54,6 @@ static HINSTANCE instance; const struct krb5_funcs *krb5_funcs = NULL; -#define KERBEROS_MAX_BUF 12000 - #define KERBEROS_CAPS \ ( SECPKG_FLAG_INTEGRITY \ | SECPKG_FLAG_PRIVACY \ @@ -600,162 +598,6 @@ static NTSTATUS NTAPI kerberos_SpGetInfo(SecPkgInfoW *info) return STATUS_SUCCESS; } -#ifdef SONAME_LIBGSSAPI_KRB5 - -WINE_DECLARE_DEBUG_CHANNEL(winediag); -static void *libgssapi_krb5_handle; - -#define MAKE_FUNCPTR(f) static typeof(f) * p##f -MAKE_FUNCPTR(gss_accept_sec_context); -MAKE_FUNCPTR(gss_acquire_cred); -MAKE_FUNCPTR(gss_delete_sec_context); -MAKE_FUNCPTR(gss_display_status); -MAKE_FUNCPTR(gss_get_mic); -MAKE_FUNCPTR(gss_import_name); -MAKE_FUNCPTR(gss_init_sec_context); -MAKE_FUNCPTR(gss_inquire_context); -MAKE_FUNCPTR(gss_release_buffer); -MAKE_FUNCPTR(gss_release_cred); -MAKE_FUNCPTR(gss_release_iov_buffer); -MAKE_FUNCPTR(gss_release_name); -MAKE_FUNCPTR(gss_unwrap); -MAKE_FUNCPTR(gss_unwrap_iov); -MAKE_FUNCPTR(gss_verify_mic); -MAKE_FUNCPTR(gss_wrap); -MAKE_FUNCPTR(gss_wrap_iov); -#undef MAKE_FUNCPTR - -static BOOL load_gssapi_krb5(void) -{ - if (!(libgssapi_krb5_handle = dlopen( SONAME_LIBGSSAPI_KRB5, RTLD_NOW ))) - { - ERR_(winediag)( "Failed to load libgssapi_krb5, Kerberos SSP support will not be available.\n" ); - return FALSE; - } - -#define LOAD_FUNCPTR(f) \ - if (!(p##f = dlsym( libgssapi_krb5_handle, #f ))) \ - { \ - ERR( "Failed to load %s\n", #f ); \ - goto fail; \ - } - - LOAD_FUNCPTR(gss_accept_sec_context) - LOAD_FUNCPTR(gss_acquire_cred) - LOAD_FUNCPTR(gss_delete_sec_context) - LOAD_FUNCPTR(gss_display_status) - LOAD_FUNCPTR(gss_get_mic) - LOAD_FUNCPTR(gss_import_name) - LOAD_FUNCPTR(gss_init_sec_context) - LOAD_FUNCPTR(gss_inquire_context) - LOAD_FUNCPTR(gss_release_buffer) - LOAD_FUNCPTR(gss_release_cred) - LOAD_FUNCPTR(gss_release_iov_buffer) - LOAD_FUNCPTR(gss_release_name) - LOAD_FUNCPTR(gss_unwrap) - LOAD_FUNCPTR(gss_unwrap_iov) - LOAD_FUNCPTR(gss_verify_mic) - LOAD_FUNCPTR(gss_wrap) - LOAD_FUNCPTR(gss_wrap_iov) -#undef LOAD_FUNCPTR - - return TRUE; - -fail: - dlclose( libgssapi_krb5_handle ); - libgssapi_krb5_handle = NULL; - return FALSE; -} - -static void unload_gssapi_krb5(void) -{ - dlclose( libgssapi_krb5_handle ); - libgssapi_krb5_handle = NULL; -} - -static inline gss_ctx_id_t ctxthandle_sspi_to_gss( LSA_SEC_HANDLE ctxt ) -{ - if (!ctxt) return GSS_C_NO_CONTEXT; - return (gss_ctx_id_t)ctxt; -} - -static NTSTATUS status_gss_to_sspi( OM_uint32 status ) -{ - switch (status) - { - case GSS_S_COMPLETE: return SEC_E_OK; - case GSS_S_BAD_MECH: return SEC_E_SECPKG_NOT_FOUND; - case GSS_S_BAD_SIG: return SEC_E_MESSAGE_ALTERED; - case GSS_S_NO_CRED: return SEC_E_NO_CREDENTIALS; - case GSS_S_NO_CONTEXT: return SEC_E_INVALID_HANDLE; - case GSS_S_DEFECTIVE_TOKEN: return SEC_E_INVALID_TOKEN; - case GSS_S_DEFECTIVE_CREDENTIAL: return SEC_E_NO_CREDENTIALS; - case GSS_S_CREDENTIALS_EXPIRED: return SEC_E_CONTEXT_EXPIRED; - case GSS_S_CONTEXT_EXPIRED: return SEC_E_CONTEXT_EXPIRED; - case GSS_S_BAD_QOP: return SEC_E_QOP_NOT_SUPPORTED; - case GSS_S_CONTINUE_NEEDED: return SEC_I_CONTINUE_NEEDED; - case GSS_S_DUPLICATE_TOKEN: return SEC_E_INVALID_TOKEN; - case GSS_S_OLD_TOKEN: return SEC_E_INVALID_TOKEN; - case GSS_S_UNSEQ_TOKEN: return SEC_E_OUT_OF_SEQUENCE; - case GSS_S_GAP_TOKEN: return SEC_E_OUT_OF_SEQUENCE; - case GSS_S_FAILURE: return SEC_E_INTERNAL_ERROR; - - default: - FIXME( "couldn't convert status 0x%08x to NTSTATUS\n", status ); - return SEC_E_INTERNAL_ERROR; - } -} - -static void trace_gss_status_ex( OM_uint32 code, int type ) -{ - OM_uint32 ret, minor_status; - gss_buffer_desc buf; - OM_uint32 message_context = 0; - - for (;;) - { - ret = pgss_display_status( &minor_status, code, type, GSS_C_NULL_OID, &message_context, &buf ); - if (GSS_ERROR(ret)) - { - TRACE( "gss_display_status(0x%08x,%d) returned %08x minor status %08x\n", - code, type, ret, minor_status ); - return; - } - TRACE( "GSS-API error: 0x%08x: %s\n", code, debugstr_an(buf.value, buf.length) ); - pgss_release_buffer( &minor_status, &buf ); - - if (!message_context) return; - } -} - -static void trace_gss_status( OM_uint32 major_status, OM_uint32 minor_status ) -{ - if (TRACE_ON(kerberos)) - { - trace_gss_status_ex( major_status, GSS_C_GSS_CODE ); - trace_gss_status_ex( minor_status, GSS_C_MECH_CODE ); - } -} - -static BOOL is_dce_style_context( gss_ctx_id_t ctxt_handle ) -{ - OM_uint32 ret, minor_status, flags; - ret = pgss_inquire_context( &minor_status, ctxt_handle, NULL, NULL, NULL, NULL, &flags, NULL, NULL ); - return (ret == GSS_S_COMPLETE && (flags & GSS_C_DCE_STYLE)); -} - -static int get_buffer_index( SecBufferDesc *desc, DWORD type ) -{ - UINT i; - if (!desc) return -1; - for (i = 0; i < desc->cBuffers; i++) - { - if (desc->pBuffers[i].BufferType == type) return i; - } - return -1; -} -#endif /* SONAME_LIBGSSAPI_KRB5 */ - static char *get_str_unixcp( const UNICODE_STRING *str ) { char *ret; @@ -955,20 +797,12 @@ static NTSTATUS NTAPI kerberos_SpInitialize(ULONG_PTR package_id, SECPKG_PARAMET WARN( "no Kerberos support\n" ); return STATUS_UNSUCCESSFUL; } -#ifdef SONAME_LIBGSSAPI_KRB5 - if (load_gssapi_krb5()) return STATUS_SUCCESS; -#endif return STATUS_SUCCESS; } static NTSTATUS NTAPI kerberos_SpShutdown(void) { TRACE("\n"); - -#ifdef SONAME_LIBGSSAPI_KRB5 - unload_gssapi_krb5(); -#endif - return STATUS_SUCCESS; } @@ -1060,93 +894,14 @@ static NTSTATUS NTAPI kerberos_SpSealMessage( LSA_SEC_HANDLE context, ULONG qual return krb5_funcs->seal_message( context, message, quality_of_protection ); } -#ifdef SONAME_LIBGSSAPI_KRB5 -static NTSTATUS unseal_message_iov( gss_ctx_id_t ctxt_handle, SecBufferDesc *message, ULONG *quality_of_protection ) -{ - gss_iov_buffer_desc iov[4]; - OM_uint32 ret, minor_status; - int token_idx, data_idx, conf_state; - - if ((data_idx = get_buffer_index( message, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; - if ((token_idx = get_buffer_index( message, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; - - iov[0].type = GSS_IOV_BUFFER_TYPE_SIGN_ONLY; - iov[0].buffer.length = 0; - iov[0].buffer.value = NULL; - - iov[1].type = GSS_IOV_BUFFER_TYPE_DATA; - iov[1].buffer.length = message->pBuffers[data_idx].cbBuffer; - iov[1].buffer.value = message->pBuffers[data_idx].pvBuffer; - - iov[2].type = GSS_IOV_BUFFER_TYPE_SIGN_ONLY; - iov[2].buffer.length = 0; - iov[2].buffer.value = NULL; - - iov[3].type = GSS_IOV_BUFFER_TYPE_HEADER; - iov[3].buffer.length = message->pBuffers[token_idx].cbBuffer; - iov[3].buffer.value = message->pBuffers[token_idx].pvBuffer; - - ret = pgss_unwrap_iov( &minor_status, ctxt_handle, &conf_state, NULL, iov, 4 ); - TRACE( "gss_unwrap_iov returned %08x minor status %08x\n", ret, minor_status ); - if (GSS_ERROR(ret)) trace_gss_status( ret, minor_status ); - if (ret == GSS_S_COMPLETE && quality_of_protection) - { - *quality_of_protection = (conf_state ? 0 : SECQOP_WRAP_NO_ENCRYPT); - } - return status_gss_to_sspi( ret ); -} - -static NTSTATUS unseal_message( gss_ctx_id_t ctxt_handle, SecBufferDesc *message, ULONG *quality_of_protection ) -{ - gss_buffer_desc input, output; - OM_uint32 ret, minor_status; - int token_idx, data_idx, conf_state; - DWORD len_data, len_token; - - if ((data_idx = get_buffer_index( message, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; - if ((token_idx = get_buffer_index( message, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; - - len_data = message->pBuffers[data_idx].cbBuffer; - len_token = message->pBuffers[token_idx].cbBuffer; - - input.length = len_data + len_token; - if (!(input.value = heap_alloc( input.length ))) return SEC_E_INSUFFICIENT_MEMORY; - memcpy( input.value, message->pBuffers[data_idx].pvBuffer, len_data ); - memcpy( (char *)input.value + len_data, message->pBuffers[token_idx].pvBuffer, len_token ); - - ret = pgss_unwrap( &minor_status, ctxt_handle, &input, &output, &conf_state, NULL ); - heap_free( input.value ); - TRACE( "gss_unwrap returned %08x minor status %08x\n", ret, minor_status ); - if (GSS_ERROR(ret)) trace_gss_status( ret, minor_status ); - if (ret == GSS_S_COMPLETE) - { - if (quality_of_protection) *quality_of_protection = (conf_state ? 0 : SECQOP_WRAP_NO_ENCRYPT); - memcpy( message->pBuffers[data_idx].pvBuffer, output.value, len_data ); - pgss_release_buffer( &minor_status, &output ); - } - - return status_gss_to_sspi( ret ); -} -#endif - static NTSTATUS NTAPI kerberos_SpUnsealMessage( LSA_SEC_HANDLE context, SecBufferDesc *message, ULONG message_seq_no, ULONG *quality_of_protection ) { -#ifdef SONAME_LIBGSSAPI_KRB5 - gss_ctx_id_t ctxt_handle; - TRACE( "(%lx %p %u %p)\n", context, message, message_seq_no, quality_of_protection ); if (message_seq_no) FIXME( "ignoring message_seq_no %u\n", message_seq_no ); if (!context) return SEC_E_INVALID_HANDLE; - ctxt_handle = ctxthandle_sspi_to_gss( context ); - - if (is_dce_style_context( ctxt_handle )) return unseal_message_iov( ctxt_handle, message, quality_of_protection ); - return unseal_message( ctxt_handle, message, quality_of_protection ); -#else - FIXME( "(%lx %p %u %p)\n", context, message, message_seq_no, quality_of_protection ); - return SEC_E_UNSUPPORTED_FUNCTION; -#endif + return krb5_funcs->unseal_message( context, message, quality_of_protection ); } static SECPKG_USER_FUNCTION_TABLE kerberos_user_table = @@ -1175,7 +930,6 @@ NTSTATUS NTAPI SpUserModeInitialize(ULONG lsa_version, PULONG package_version, *package_version = SECPKG_INTERFACE_VERSION; *table = &kerberos_user_table; *table_count = 1; - return STATUS_SUCCESS; } diff --git a/dlls/kerberos/unixlib.c b/dlls/kerberos/unixlib.c index 6ac9c294352..4e9b90eeccf 100644 --- a/dlls/kerberos/unixlib.c +++ b/dlls/kerberos/unixlib.c @@ -734,6 +734,81 @@ static NTSTATUS CDECL seal_message( LSA_SEC_HANDLE context, SecBufferDesc *msg, return seal_message_no_vector( ctx, msg, qop ); } +static NTSTATUS unseal_message_vector( gss_ctx_id_t ctx, SecBufferDesc *msg, ULONG *qop ) +{ + gss_iov_buffer_desc iov[4]; + OM_uint32 ret, minor_status; + int token_idx, data_idx, conf_state; + + if ((data_idx = get_buffer_index( msg, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; + if ((token_idx = get_buffer_index( msg, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + + iov[0].type = GSS_IOV_BUFFER_TYPE_SIGN_ONLY; + iov[0].buffer.length = 0; + iov[0].buffer.value = NULL; + + iov[1].type = GSS_IOV_BUFFER_TYPE_DATA; + iov[1].buffer.length = msg->pBuffers[data_idx].cbBuffer; + iov[1].buffer.value = msg->pBuffers[data_idx].pvBuffer; + + iov[2].type = GSS_IOV_BUFFER_TYPE_SIGN_ONLY; + iov[2].buffer.length = 0; + iov[2].buffer.value = NULL; + + iov[3].type = GSS_IOV_BUFFER_TYPE_HEADER; + iov[3].buffer.length = msg->pBuffers[token_idx].cbBuffer; + iov[3].buffer.value = msg->pBuffers[token_idx].pvBuffer; + + ret = pgss_unwrap_iov( &minor_status, ctx, &conf_state, NULL, iov, 4 ); + TRACE( "gss_unwrap_iov returned %08x minor status %08x\n", ret, minor_status ); + if (GSS_ERROR( ret )) trace_gss_status( ret, minor_status ); + if (ret == GSS_S_COMPLETE && qop) + { + *qop = (conf_state ? 0 : SECQOP_WRAP_NO_ENCRYPT); + } + return status_gss_to_sspi( ret ); +} + +static NTSTATUS unseal_message_no_vector( gss_ctx_id_t ctx, SecBufferDesc *msg, ULONG *qop ) +{ + gss_buffer_desc input, output; + OM_uint32 ret, minor_status; + int token_idx, data_idx, conf_state; + DWORD len_data, len_token; + + if ((data_idx = get_buffer_index( msg, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; + if ((token_idx = get_buffer_index( msg, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + + len_data = msg->pBuffers[data_idx].cbBuffer; + len_token = msg->pBuffers[token_idx].cbBuffer; + + input.length = len_data + len_token; + if (!(input.value = RtlAllocateHeap( GetProcessHeap(), 0, input.length ))) return SEC_E_INSUFFICIENT_MEMORY; + memcpy( input.value, msg->pBuffers[data_idx].pvBuffer, len_data ); + memcpy( (char *)input.value + len_data, msg->pBuffers[token_idx].pvBuffer, len_token ); + + ret = pgss_unwrap( &minor_status, ctx, &input, &output, &conf_state, NULL ); + RtlFreeHeap( GetProcessHeap(), 0, input.value ); + TRACE( "gss_unwrap returned %08x minor status %08x\n", ret, minor_status ); + if (GSS_ERROR( ret )) trace_gss_status( ret, minor_status ); + if (ret == GSS_S_COMPLETE) + { + if (qop) *qop = (conf_state ? 0 : SECQOP_WRAP_NO_ENCRYPT); + memcpy( msg->pBuffers[data_idx].pvBuffer, output.value, len_data ); + pgss_release_buffer( &minor_status, &output ); + } + + return status_gss_to_sspi( ret ); +} + +static NTSTATUS CDECL unseal_message( LSA_SEC_HANDLE context, SecBufferDesc *msg, ULONG *qop ) +{ + gss_ctx_id_t ctx = ctxhandle_sspi_to_gss( context ); + + if (is_dce_style_context( ctx )) return unseal_message_vector( ctx, msg, qop ); + return unseal_message_no_vector( ctx, msg, qop ); +} + static NTSTATUS CDECL verify_signature( LSA_SEC_HANDLE context, SecBufferDesc *msg, ULONG *qop ) { OM_uint32 ret, minor_status; @@ -767,6 +842,7 @@ static const struct krb5_funcs funcs = make_signature, query_context_attributes, seal_message, + unseal_message, verify_signature, }; diff --git a/dlls/kerberos/unixlib.h b/dlls/kerberos/unixlib.h index ec783d342e5..652a6e4f300 100644 --- a/dlls/kerberos/unixlib.h +++ b/dlls/kerberos/unixlib.h @@ -34,6 +34,7 @@ struct krb5_funcs NTSTATUS (CDECL *make_signature)(LSA_SEC_HANDLE, SecBufferDesc *); NTSTATUS (CDECL *query_context_attributes)(LSA_SEC_HANDLE, ULONG, void *); NTSTATUS (CDECL *seal_message)(LSA_SEC_HANDLE, SecBufferDesc *, ULONG); + NTSTATUS (CDECL *unseal_message)(LSA_SEC_HANDLE, SecBufferDesc *, ULONG *); NTSTATUS (CDECL *verify_signature)(LSA_SEC_HANDLE, SecBufferDesc *, ULONG *); }; -- 2.30.2

1 0

[PATCH 2/7] kerberos: Move support for SpSealMessage to the Unix library.
by Hans Leidekker April 21, 2021

April 21, 2021

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/kerberos/krb5_ap.c | 107 +--------------------------------------- dlls/kerberos/unixlib.c | 102 ++++++++++++++++++++++++++++++++++++++ dlls/kerberos/unixlib.h | 1 + 3 files changed, 104 insertions(+), 106 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 61833b4e040..d248c4e1951 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -1050,119 +1050,14 @@ static NTSTATUS NTAPI kerberos_SpVerifySignature( LSA_SEC_HANDLE context, SecBuf return krb5_funcs->verify_signature( context, message, quality_of_protection ); } -#ifdef SONAME_LIBGSSAPI_KRB5 -static NTSTATUS seal_message_iov( gss_ctx_id_t ctxt_handle, SecBufferDesc *message, ULONG quality_of_protection ) -{ - gss_iov_buffer_desc iov[4]; - OM_uint32 ret, minor_status; - int token_idx, data_idx, conf_flag, conf_state; - - if (!quality_of_protection) - conf_flag = 1; /* confidentiality + integrity */ - else if (quality_of_protection == SECQOP_WRAP_NO_ENCRYPT) - conf_flag = 0; /* only integrity */ - else - { - FIXME( "QOP %08x not supported\n", quality_of_protection ); - return SEC_E_UNSUPPORTED_FUNCTION; - } - - /* FIXME: multiple data buffers, read-only buffers */ - if ((data_idx = get_buffer_index( message, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; - if ((token_idx = get_buffer_index( message, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; - - iov[0].type = GSS_IOV_BUFFER_TYPE_SIGN_ONLY | GSS_IOV_BUFFER_FLAG_ALLOCATE; - iov[0].buffer.length = 0; - iov[0].buffer.value = NULL; - - iov[1].type = GSS_IOV_BUFFER_TYPE_DATA; - iov[1].buffer.length = message->pBuffers[data_idx].cbBuffer; - iov[1].buffer.value = message->pBuffers[data_idx].pvBuffer; - - iov[2].type = GSS_IOV_BUFFER_TYPE_SIGN_ONLY | GSS_IOV_BUFFER_FLAG_ALLOCATE; - iov[2].buffer.length = 0; - iov[2].buffer.value = NULL; - - iov[3].type = GSS_IOV_BUFFER_TYPE_HEADER | GSS_IOV_BUFFER_FLAG_ALLOCATE; - iov[3].buffer.length = 0; - iov[3].buffer.value = NULL; - - ret = pgss_wrap_iov( &minor_status, ctxt_handle, conf_flag, GSS_C_QOP_DEFAULT, &conf_state, iov, 4 ); - TRACE( "gss_wrap_iov returned %08x minor status %08x\n", ret, minor_status ); - if (GSS_ERROR(ret)) trace_gss_status( ret, minor_status ); - if (ret == GSS_S_COMPLETE) - { - memcpy( message->pBuffers[token_idx].pvBuffer, iov[3].buffer.value, iov[3].buffer.length ); - message->pBuffers[token_idx].cbBuffer = iov[3].buffer.length; - pgss_release_iov_buffer( &minor_status, iov, 4 ); - } - - return status_gss_to_sspi( ret ); -} - -static NTSTATUS seal_message( gss_ctx_id_t ctxt_handle, SecBufferDesc *message, ULONG quality_of_protection ) -{ - gss_buffer_desc input, output; - OM_uint32 ret, minor_status; - int token_idx, data_idx, conf_flag, conf_state; - - if (!quality_of_protection) - conf_flag = 1; /* confidentiality + integrity */ - else if (quality_of_protection == SECQOP_WRAP_NO_ENCRYPT) - conf_flag = 0; /* only integrity */ - else - { - FIXME( "QOP %08x not supported\n", quality_of_protection ); - return SEC_E_UNSUPPORTED_FUNCTION; - } - - /* FIXME: multiple data buffers, read-only buffers */ - if ((data_idx = get_buffer_index( message, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; - if ((token_idx = get_buffer_index( message, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; - - input.length = message->pBuffers[data_idx].cbBuffer; - input.value = message->pBuffers[data_idx].pvBuffer; - - ret = pgss_wrap( &minor_status, ctxt_handle, conf_flag, GSS_C_QOP_DEFAULT, &input, &conf_state, &output ); - TRACE( "gss_wrap returned %08x minor status %08x\n", ret, minor_status ); - if (GSS_ERROR(ret)) trace_gss_status( ret, minor_status ); - if (ret == GSS_S_COMPLETE) - { - DWORD len_data = message->pBuffers[data_idx].cbBuffer, len_token = message->pBuffers[token_idx].cbBuffer; - if (len_token < output.length - len_data) - { - TRACE( "buffer too small %lu > %u\n", (SIZE_T)output.length - len_data, len_token ); - pgss_release_buffer( &minor_status, &output ); - return SEC_E_BUFFER_TOO_SMALL; - } - memcpy( message->pBuffers[data_idx].pvBuffer, output.value, len_data ); - memcpy( message->pBuffers[token_idx].pvBuffer, (char *)output.value + len_data, output.length - len_data ); - message->pBuffers[token_idx].cbBuffer = output.length - len_data; - pgss_release_buffer( &minor_status, &output ); - } - - return status_gss_to_sspi( ret ); -} -#endif - static NTSTATUS NTAPI kerberos_SpSealMessage( LSA_SEC_HANDLE context, ULONG quality_of_protection, SecBufferDesc *message, ULONG message_seq_no ) { -#ifdef SONAME_LIBGSSAPI_KRB5 - gss_ctx_id_t ctxt_handle; - TRACE( "(%lx 0x%08x %p %u)\n", context, quality_of_protection, message, message_seq_no ); if (message_seq_no) FIXME( "ignoring message_seq_no %u\n", message_seq_no ); if (!context) return SEC_E_INVALID_HANDLE; - ctxt_handle = ctxthandle_sspi_to_gss( context ); - - if (is_dce_style_context( ctxt_handle )) return seal_message_iov( ctxt_handle, message, quality_of_protection ); - return seal_message( ctxt_handle, message, quality_of_protection ); -#else - FIXME( "(%lx 0x%08x %p %u)\n", context, quality_of_protection, message, message_seq_no ); - return SEC_E_UNSUPPORTED_FUNCTION; -#endif + return krb5_funcs->seal_message( context, message, quality_of_protection ); } #ifdef SONAME_LIBGSSAPI_KRB5 diff --git a/dlls/kerberos/unixlib.c b/dlls/kerberos/unixlib.c index 34da8460406..6ac9c294352 100644 --- a/dlls/kerberos/unixlib.c +++ b/dlls/kerberos/unixlib.c @@ -633,6 +633,107 @@ static NTSTATUS CDECL query_context_attributes( LSA_SEC_HANDLE context, ULONG at return SEC_E_UNSUPPORTED_FUNCTION; } +static NTSTATUS seal_message_vector( gss_ctx_id_t ctx, SecBufferDesc *msg, ULONG qop ) +{ + gss_iov_buffer_desc iov[4]; + OM_uint32 ret, minor_status; + int token_idx, data_idx, conf_flag, conf_state; + + if (!qop) + conf_flag = 1; /* confidentiality + integrity */ + else if (qop == SECQOP_WRAP_NO_ENCRYPT) + conf_flag = 0; /* only integrity */ + else + { + FIXME( "QOP %08x not supported\n", qop ); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + /* FIXME: multiple data buffers, read-only buffers */ + if ((data_idx = get_buffer_index( msg, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; + if ((token_idx = get_buffer_index( msg, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + + iov[0].type = GSS_IOV_BUFFER_TYPE_SIGN_ONLY | GSS_IOV_BUFFER_FLAG_ALLOCATE; + iov[0].buffer.length = 0; + iov[0].buffer.value = NULL; + + iov[1].type = GSS_IOV_BUFFER_TYPE_DATA; + iov[1].buffer.length = msg->pBuffers[data_idx].cbBuffer; + iov[1].buffer.value = msg->pBuffers[data_idx].pvBuffer; + + iov[2].type = GSS_IOV_BUFFER_TYPE_SIGN_ONLY | GSS_IOV_BUFFER_FLAG_ALLOCATE; + iov[2].buffer.length = 0; + iov[2].buffer.value = NULL; + + iov[3].type = GSS_IOV_BUFFER_TYPE_HEADER | GSS_IOV_BUFFER_FLAG_ALLOCATE; + iov[3].buffer.length = 0; + iov[3].buffer.value = NULL; + + ret = pgss_wrap_iov( &minor_status, ctx, conf_flag, GSS_C_QOP_DEFAULT, &conf_state, iov, 4 ); + TRACE( "gss_wrap_iov returned %08x minor status %08x\n", ret, minor_status ); + if (GSS_ERROR( ret )) trace_gss_status( ret, minor_status ); + if (ret == GSS_S_COMPLETE) + { + memcpy( msg->pBuffers[token_idx].pvBuffer, iov[3].buffer.value, iov[3].buffer.length ); + msg->pBuffers[token_idx].cbBuffer = iov[3].buffer.length; + pgss_release_iov_buffer( &minor_status, iov, 4 ); + } + + return status_gss_to_sspi( ret ); +} + +static NTSTATUS seal_message_no_vector( gss_ctx_id_t ctx, SecBufferDesc *msg, ULONG qop ) +{ + gss_buffer_desc input, output; + OM_uint32 ret, minor_status; + int token_idx, data_idx, conf_flag, conf_state; + + if (!qop) + conf_flag = 1; /* confidentiality + integrity */ + else if (qop == SECQOP_WRAP_NO_ENCRYPT) + conf_flag = 0; /* only integrity */ + else + { + FIXME( "QOP %08x not supported\n", qop ); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + /* FIXME: multiple data buffers, read-only buffers */ + if ((data_idx = get_buffer_index( msg, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; + if ((token_idx = get_buffer_index( msg, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + + input.length = msg->pBuffers[data_idx].cbBuffer; + input.value = msg->pBuffers[data_idx].pvBuffer; + + ret = pgss_wrap( &minor_status, ctx, conf_flag, GSS_C_QOP_DEFAULT, &input, &conf_state, &output ); + TRACE( "gss_wrap returned %08x minor status %08x\n", ret, minor_status ); + if (GSS_ERROR( ret )) trace_gss_status( ret, minor_status ); + if (ret == GSS_S_COMPLETE) + { + DWORD len_data = msg->pBuffers[data_idx].cbBuffer, len_token = msg->pBuffers[token_idx].cbBuffer; + if (len_token < output.length - len_data) + { + TRACE( "buffer too small %lu > %u\n", (SIZE_T)output.length - len_data, len_token ); + pgss_release_buffer( &minor_status, &output ); + return SEC_E_BUFFER_TOO_SMALL; + } + memcpy( msg->pBuffers[data_idx].pvBuffer, output.value, len_data ); + memcpy( msg->pBuffers[token_idx].pvBuffer, (char *)output.value + len_data, output.length - len_data ); + msg->pBuffers[token_idx].cbBuffer = output.length - len_data; + pgss_release_buffer( &minor_status, &output ); + } + + return status_gss_to_sspi( ret ); +} + +static NTSTATUS CDECL seal_message( LSA_SEC_HANDLE context, SecBufferDesc *msg, ULONG qop ) +{ + gss_ctx_id_t ctx = ctxhandle_sspi_to_gss( context ); + + if (is_dce_style_context( ctx )) return seal_message_vector( ctx, msg, qop ); + return seal_message_no_vector( ctx, msg, qop ); +} + static NTSTATUS CDECL verify_signature( LSA_SEC_HANDLE context, SecBufferDesc *msg, ULONG *qop ) { OM_uint32 ret, minor_status; @@ -665,6 +766,7 @@ static const struct krb5_funcs funcs = initialize_context, make_signature, query_context_attributes, + seal_message, verify_signature, }; diff --git a/dlls/kerberos/unixlib.h b/dlls/kerberos/unixlib.h index 8fd562a28d7..ec783d342e5 100644 --- a/dlls/kerberos/unixlib.h +++ b/dlls/kerberos/unixlib.h @@ -33,6 +33,7 @@ struct krb5_funcs LSA_SEC_HANDLE *, SecBufferDesc *, ULONG *, TimeStamp *); NTSTATUS (CDECL *make_signature)(LSA_SEC_HANDLE, SecBufferDesc *); NTSTATUS (CDECL *query_context_attributes)(LSA_SEC_HANDLE, ULONG, void *); + NTSTATUS (CDECL *seal_message)(LSA_SEC_HANDLE, SecBufferDesc *, ULONG); NTSTATUS (CDECL *verify_signature)(LSA_SEC_HANDLE, SecBufferDesc *, ULONG *); }; -- 2.30.2

1 0