January 2018 - Wine-devel - list.winehq.org

[PATCH 1/4] include: Add generic HeapAlloc() wrappers
by Michael Stefaniuc 26 Jan '18

26 Jan '18

version 2: Just use the non-controversial parts. Basically the stuff we already have with following changes: heap_realloc - Passing NULL as memory pointer will allocate new memory. no heap_realloc_zero() - few uses - some defined but not used heap_free() returns void: - No existing use of the heap_free() return value. - There are a few "return HeapFree()" statements but more than half of those are just in heap_free() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/Makefile.in | 1 + include/wine/heap.h | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 include/wine/heap.h diff --git a/include/Makefile.in b/include/Makefile.in index b975dd585e..748b64165f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -680,6 +680,7 @@ HEADER_SRCS = \ windowsx.h \ wine/debug.h \ wine/exception.h \ + wine/heap.h \ wine/library.h \ wine/unicode.h \ winerror.h \ diff --git a/include/wine/heap.h b/include/wine/heap.h new file mode 100644 index 0000000000..2ae5aff578 --- /dev/null +++ b/include/wine/heap.h @@ -0,0 +1,58 @@ +/* + * Wine heap memory allocation wrappers + * + * Copyright 2006 Jacek Caban for CodeWeavers + * Copyright 2013,2018 Michael Stefaniuc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_WINE_HEAP_H +#define __WINE_WINE_HEAP_H + +#include <windef.h> + +#ifdef __cplusplus +extern "C" { +#endif + +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(SIZE_T len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(SIZE_T len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + +static inline void * __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, SIZE_T len) +{ + if (mem) + return HeapReAlloc(GetProcessHeap(), 0, mem, len); + else + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline void heap_free(void *mem) +{ + HeapFree(GetProcessHeap(), 0, mem); +} + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_WINE_HEAP_H */ -- 2.14.3

3 2

[PATCH 1/5] comctl32/tests: A test for TCN_SELCHANGING handling
by Nikolay Sivov 25 Jan '18

25 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/tab.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 0bfbb38a58..9823915724 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -79,6 +79,7 @@ static void TabCheckSetSize(HWND hwnd, INT set_width, INT set_height, INT exp_wi static HFONT hFont; static DRAWITEMSTRUCT g_drawitem; static HWND parent_wnd; +static LRESULT tcn_selchanging_result; static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; @@ -264,6 +265,22 @@ static const struct message rbuttonup_seq[] = { { 0 } }; +static const struct message full_selchange_parent_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, TCN_SELCHANGING }, + { WM_NOTIFY, sent|id, 0, 0, TCN_SELCHANGE }, + { 0 } +}; + +static const struct message selchanging_parent_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, TCN_SELCHANGING }, + { 0 } +}; + +static const struct message selchange_parent_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, TCN_SELCHANGE }, + { 0 } +}; + static HWND create_tabcontrol (DWORD style, DWORD mask) { @@ -322,6 +339,8 @@ static LRESULT WINAPI parentWindowProcess(HWND hwnd, UINT message, WPARAM wParam if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; + if (message == WM_NOTIFY && lParam) + msg.id = ((NMHDR*)lParam)->code; add_message(sequences, PARENT_SEQ_INDEX, &msg); } @@ -329,6 +348,13 @@ static LRESULT WINAPI parentWindowProcess(HWND hwnd, UINT message, WPARAM wParam if (message == WM_DRAWITEM) g_drawitem = *(DRAWITEMSTRUCT*)lParam; + if (message == WM_NOTIFY) + { + NMHDR *nmhdr = (NMHDR *)lParam; + if (nmhdr && nmhdr->code == TCN_SELCHANGING) + return tcn_selchanging_result; + } + defwndproc_counter++; ret = DefWindowProcA(hwnd, message, wParam, lParam); defwndproc_counter--; @@ -1443,6 +1469,73 @@ static void init_functions(void) #undef X } +static void test_TCN_SELCHANGING(void) +{ + const INT nTabs = 5; + HWND hTab; + INT ret; + + hTab = createFilledTabControl(parent_wnd, WS_CHILD|TCS_FIXEDWIDTH, TCIF_TEXT|TCIF_IMAGE, nTabs); + ok(hTab != NULL, "Failed to create tab control\n"); + + /* Initially first tab is focused. */ + ret = SendMessageA(hTab, TCM_GETCURFOCUS, 0, 0); + ok(ret == 0, "Unexpected tab focus %d.\n", ret); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + /* Setting focus to currently focused item should do nothing. */ + ret = SendMessageA(hTab, TCM_SETCURFOCUS, 0, 0); + ok(ret == 0, "Unexpected ret value %d.\n", ret); + + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_sequence, "Set focus to focused tab sequence", FALSE); + + /* Allow selection change. */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + tcn_selchanging_result = 0; + ret = SendMessageA(hTab, TCM_SETCURFOCUS, nTabs - 1, 0); + ok(ret == 0, "Unexpected ret value %d.\n", ret); + + ok_sequence(sequences, PARENT_SEQ_INDEX, full_selchange_parent_seq, "Focus change allowed sequence", FALSE); + + ret = SendMessageA(hTab, TCM_GETCURFOCUS, 0, 0); + ok(ret == nTabs - 1, "Unexpected focused tab %d.\n", ret); + ret = SendMessageA(hTab, TCM_GETCURSEL, 0, 0); + ok(ret == nTabs - 1, "Unexpected selected tab %d.\n", ret); + + /* Forbid selection change. */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + tcn_selchanging_result = 1; + ret = SendMessageA(hTab, TCM_SETCURFOCUS, 0, 0); + ok(ret == 0, "Unexpected ret value %d.\n", ret); + + ok_sequence(sequences, PARENT_SEQ_INDEX, selchanging_parent_seq, "Focus change disallowed sequence", FALSE); + + ret = SendMessageA(hTab, TCM_GETCURFOCUS, 0, 0); +todo_wine + ok(ret == nTabs - 1, "Unexpected focused tab %d.\n", ret); + ret = SendMessageA(hTab, TCM_GETCURSEL, 0, 0); +todo_wine + ok(ret == nTabs - 1, "Unexpected selected tab %d.\n", ret); + + /* Removing focus sends only TCN_SELCHANGE */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + ret = SendMessageA(hTab, TCM_SETCURFOCUS, -1, 0); + ok(ret == 0, "Unexpected ret value %d.\n", ret); + + ok_sequence(sequences, PARENT_SEQ_INDEX, selchange_parent_seq, "Remove focus sequence", FALSE); + + ret = SendMessageA(hTab, TCM_GETCURFOCUS, 0, 0); + ok(ret == -1, "Unexpected focused tab %d.\n", ret); + + tcn_selchanging_result = 0; + + DestroyWindow(hTab); +} + START_TEST(tab) { LOGFONTA logfont; @@ -1481,6 +1574,7 @@ START_TEST(tab) test_TCS_OWNERDRAWFIXED(); test_WM_CONTEXTMENU(); test_create(); + test_TCN_SELCHANGING(); DestroyWindow(parent_wnd); } -- 2.15.1

1 4

[PATCH 1/5] dxgi: Add stub implementation for DXGI_PRESENT_TEST.
by Józef Kucia 25 Jan '18

25 Jan '18

From: Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Rebased and modified. Avoids excessive buffer swaps. --- dlls/dxgi/swapchain.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 8e7dccbf9618..2983ec59438c 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -532,10 +532,16 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_Present1(IDXGISwapChain1 *iface, TRACE("iface %p, sync_interval %u, flags %#x, present_parameters %p.\n", iface, sync_interval, flags, present_parameters); + if (flags & ~DXGI_PRESENT_TEST) + FIXME("Unimplemented flags %#x.\n", flags); + if (flags & DXGI_PRESENT_TEST) + { + WARN("Returning S_OK for DXGI_PRESENT_TEST.\n"); + return S_OK; + } + if (sync_interval) FIXME("Unimplemented sync interval %u.\n", sync_interval); - if (flags) - FIXME("Unimplemented flags %#x.\n", flags); if (present_parameters) FIXME("Ignored present parameters %p.\n", present_parameters); -- 2.13.6

3 11

[PATCH vkd3d 1/2] libs/vkd3d-shader: Adjust barrier emission.
by Józef Kucia 25 Jan '18

25 Jan '18

From: Józef Kucia <jkucia(a)codeweavers.com> Aligns with glsang changes which are based on Khronos recommendations. https://github.com/KhronosGroup/glslang/commit/8297936dd6eb32163991899c31dd… https://github.com/KhronosGroup/glslang/commit/838d7afc61c0f5909514c20cd0ed… https://github.com/KhronosGroup/glslang/commit/2505057af8f446981afc63768a97… Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 202c18d61924..50803af1f69f 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5393,7 +5393,9 @@ static void vkd3d_dxbc_compiler_emit_sync(struct vkd3d_dxbc_compiler *compiler, unsigned int flags = instruction->flags; SpvScope execution_scope = SpvScopeMax; SpvScope memory_scope = SpvScopeDevice; - unsigned int memory_semantics = 0; + unsigned int memory_semantics; + + memory_semantics = SpvMemorySemanticsAcquireReleaseMask; if (flags & VKD3DSSF_GROUP_SHARED_MEMORY) { @@ -5413,8 +5415,7 @@ static void vkd3d_dxbc_compiler_emit_sync(struct vkd3d_dxbc_compiler *compiler, FIXME("Unhandled sync flags %#x.\n", flags); memory_scope = SpvScopeDevice; execution_scope = SpvScopeWorkgroup; - memory_semantics |= SpvMemorySemanticsSequentiallyConsistentMask - | SpvMemorySemanticsUniformMemoryMask + memory_semantics |= SpvMemorySemanticsUniformMemoryMask | SpvMemorySemanticsSubgroupMemoryMask | SpvMemorySemanticsWorkgroupMemoryMask | SpvMemorySemanticsCrossWorkgroupMemoryMask -- 2.13.6

2 3

[PATCH 9/9] kerberos: Don't fail InitializeSecurityContext if there are unsupported flags.
by Dmitry Timoshkov 25 Jan '18

25 Jan '18

Kerberos Authentication Tester passes ISC_REQ_CONNECTION along with some other flags that currently lead InitializeSecurityContext to fail. With this patch applied, and the patch that implements switch between NTLM and Kerberos in Negotiate provider Kerberos Authentication Tester works in the real Kerberos environment. This is another fix to make Kerberos Authentication Tester work. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 66c795c377..5fa6783011 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -471,10 +471,7 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, context_req, target_data_rep, input, new_context, output, context_attr, ts_expiry, mapped_context, context_data ); if (context_req & ~supported) - { FIXME( "flags 0x%08x not supported\n", context_req & ~supported ); - return SEC_E_UNSUPPORTED_FUNCTION; - } if (!context && !input && !credential) return SEC_E_INVALID_HANDLE; cred_handle = credhandle_sspi_to_gss( credential ); -- 2.15.1

2 1

[PATCH 7/9] kerberos: Implement SpUnsealMessage.
by Dmitry Timoshkov 25 Jan '18

25 Jan '18

From: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 75003ccf7b..ba89806957 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -196,6 +196,7 @@ 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_iov); MAKE_FUNCPTR(gss_verify_mic); MAKE_FUNCPTR(gss_wrap_iov); #undef MAKE_FUNCPTR @@ -225,6 +226,7 @@ static BOOL load_gssapi_krb5(void) LOAD_FUNCPTR(gss_release_cred) LOAD_FUNCPTR(gss_release_iov_buffer) LOAD_FUNCPTR(gss_release_name) + LOAD_FUNCPTR(gss_unwrap_iov) LOAD_FUNCPTR(gss_verify_mic) LOAD_FUNCPTR(gss_wrap_iov) #undef LOAD_FUNCPTR @@ -875,6 +877,52 @@ static NTSTATUS NTAPI kerberos_SpSealMessage( LSA_SEC_HANDLE context, ULONG qual #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; + gss_iov_buffer_desc iov[4]; + OM_uint32 ret, minor_status; + int token_idx, data_idx, conf_state; + + TRACE( "(%lx %p %u %p)\n", context, message, message_seq_no, quality_of_protection ); + if (message_seq_no) FIXME( "ignoring message_seq_no %0x08x\n", message_seq_no ); + + if (context) return SEC_E_INVALID_HANDLE; + ctxt_handle = ctxthandle_sspi_to_gss( context ); + + 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 (ret == GSS_S_COMPLETE && quality_of_protection) *quality_of_protection = (conf_state ? 0 : SECQOP_WRAP_NO_ENCRYPT); + + return status_gss_to_sspi( ret ); + +#else + FIXME( "(%lx %p %u %p)\n", context, message, message_seq_no, quality_of_protection ); + return SEC_E_UNSUPPORTED_FUNCTION; +#endif +} + static SECPKG_USER_FUNCTION_TABLE kerberos_user_table = { kerberos_SpInstanceInit, @@ -882,7 +930,7 @@ static SECPKG_USER_FUNCTION_TABLE kerberos_user_table = kerberos_SpMakeSignature, kerberos_SpVerifySignature, kerberos_SpSealMessage, - NULL, /* SpUnsealMessage */ + kerberos_SpUnsealMessage, NULL, /* SpGetContextToken */ NULL, /* SpQueryContextAttributes */ NULL, /* SpCompleteAuthToken */ -- 2.15.1

2 1

[PATCH 6/9] kerberos: Implement SpSealMessage.
by Dmitry Timoshkov 25 Jan '18

25 Jan '18

From: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 43bbbae7e2..75003ccf7b 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -194,8 +194,10 @@ MAKE_FUNCPTR(gss_import_name); MAKE_FUNCPTR(gss_init_sec_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_verify_mic); +MAKE_FUNCPTR(gss_wrap_iov); #undef MAKE_FUNCPTR static BOOL load_gssapi_krb5(void) @@ -221,8 +223,10 @@ static BOOL load_gssapi_krb5(void) LOAD_FUNCPTR(gss_init_sec_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_verify_mic) + LOAD_FUNCPTR(gss_wrap_iov) #undef LOAD_FUNCPTR return TRUE; @@ -815,13 +819,69 @@ static SECURITY_STATUS SEC_ENTRY kerberos_SpVerifySignature( LSA_SEC_HANDLE cont #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; + gss_iov_buffer_desc iov[4]; + OM_uint32 ret, minor_status; + int token_idx, data_idx, conf_state; + + TRACE( "(%lx 0x%08x %p %u)\n", context, quality_of_protection, message, message_seq_no ); + if (quality_of_protection) + { + FIXME( "flags %08x not supported\n", quality_of_protection ); + return SEC_E_UNSUPPORTED_FUNCTION; + } + if (message_seq_no) FIXME( "ignoring message_seq_no %0x08x\n", message_seq_no ); + + if (!context) return SEC_E_INVALID_HANDLE; + ctxt_handle = ctxthandle_sspi_to_gss( context ); + + /* 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, 1, GSS_C_QOP_DEFAULT, &conf_state, iov, 4 ); + TRACE( "gss_wrap_iov returned %08x minor status %08x\n", 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 ); +#else + FIXME( "(%lx 0x%08x %p %u)\n", context, quality_of_protection, message, message_seq_no ); + return SEC_E_UNSUPPORTED_FUNCTION; +#endif +} + static SECPKG_USER_FUNCTION_TABLE kerberos_user_table = { kerberos_SpInstanceInit, NULL, /* SpInitUserModeContext */ kerberos_SpMakeSignature, kerberos_SpVerifySignature, - NULL, /* SpSealMessage */ + kerberos_SpSealMessage, NULL, /* SpUnsealMessage */ NULL, /* SpGetContextToken */ NULL, /* SpQueryContextAttributes */ -- 2.15.1

2 1

[PATCH 5/9] kerberos: Implement SpVerifySignature.
by Dmitry Timoshkov 25 Jan '18

25 Jan '18

From: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 451e08508b..43bbbae7e2 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -195,6 +195,7 @@ MAKE_FUNCPTR(gss_init_sec_context); MAKE_FUNCPTR(gss_release_buffer); MAKE_FUNCPTR(gss_release_cred); MAKE_FUNCPTR(gss_release_name); +MAKE_FUNCPTR(gss_verify_mic); #undef MAKE_FUNCPTR static BOOL load_gssapi_krb5(void) @@ -221,6 +222,7 @@ static BOOL load_gssapi_krb5(void) LOAD_FUNCPTR(gss_release_buffer) LOAD_FUNCPTR(gss_release_cred) LOAD_FUNCPTR(gss_release_name) + LOAD_FUNCPTR(gss_verify_mic) #undef LOAD_FUNCPTR return TRUE; @@ -779,12 +781,46 @@ static NTSTATUS SEC_ENTRY kerberos_SpMakeSignature( LSA_SEC_HANDLE context, ULON #endif } +static SECURITY_STATUS SEC_ENTRY kerberos_SpVerifySignature( LSA_SEC_HANDLE context, SecBufferDesc *message, + ULONG message_seq_no, ULONG *quality_of_protection ) +{ +#ifdef SONAME_LIBGSSAPI_KRB5 + OM_uint32 ret, minor_status; + gss_buffer_desc data_buffer, token_buffer; + gss_ctx_id_t ctxt_handle; + int data_idx, token_idx; + + TRACE( "(%lx %p %u %p)\n", context, message, message_seq_no, quality_of_protection ); + if (message_seq_no) FIXME( "ignoring message_seq_no %0x08x\n", message_seq_no ); + + if (!context) return SEC_E_INVALID_HANDLE; + ctxt_handle = ctxthandle_sspi_to_gss( context ); + + if ((data_idx = get_buffer_index( message, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; + data_buffer.length = message->pBuffers[data_idx].cbBuffer; + data_buffer.value = message->pBuffers[data_idx].pvBuffer; + + if ((token_idx = get_buffer_index( message, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + token_buffer.length = message->pBuffers[token_idx].cbBuffer; + token_buffer.value = message->pBuffers[token_idx].pvBuffer; + + ret = pgss_verify_mic( &minor_status, ctxt_handle, &data_buffer, &token_buffer, NULL ); + TRACE( "gss_verify_mic returned %08x minor status %08x\n", ret, minor_status ); + if (ret == GSS_S_COMPLETE && quality_of_protection) *quality_of_protection = 0; + + return status_gss_to_sspi( ret ); +#else + FIXME( "(%lx %p %u %p)\n", context, message, message_seq_no, quality_of_protection ); + return SEC_E_UNSUPPORTED_FUNCTION; +#endif +} + static SECPKG_USER_FUNCTION_TABLE kerberos_user_table = { kerberos_SpInstanceInit, NULL, /* SpInitUserModeContext */ kerberos_SpMakeSignature, - NULL, /* SpVerifySignature */ + kerberos_SpVerifySignature, NULL, /* SpSealMessage */ NULL, /* SpUnsealMessage */ NULL, /* SpGetContextToken */ -- 2.15.1

2 1

[PATCH 4/9] kerberos: Implement SpMakeSignature.
by Dmitry Timoshkov 25 Jan '18

25 Jan '18

From: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index dcf3386675..451e08508b 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -189,6 +189,7 @@ static void *libgssapi_krb5_handle; MAKE_FUNCPTR(gss_accept_sec_context); MAKE_FUNCPTR(gss_acquire_cred); MAKE_FUNCPTR(gss_delete_sec_context); +MAKE_FUNCPTR(gss_get_mic); MAKE_FUNCPTR(gss_import_name); MAKE_FUNCPTR(gss_init_sec_context); MAKE_FUNCPTR(gss_release_buffer); @@ -214,6 +215,7 @@ static BOOL load_gssapi_krb5(void) LOAD_FUNCPTR(gss_accept_sec_context) LOAD_FUNCPTR(gss_acquire_cred) LOAD_FUNCPTR(gss_delete_sec_context) + LOAD_FUNCPTR(gss_get_mic) LOAD_FUNCPTR(gss_import_name) LOAD_FUNCPTR(gss_init_sec_context) LOAD_FUNCPTR(gss_release_buffer) @@ -736,11 +738,52 @@ static NTSTATUS NTAPI kerberos_SpInstanceInit(ULONG version, SECPKG_DLL_FUNCTION return STATUS_SUCCESS; } +static NTSTATUS SEC_ENTRY kerberos_SpMakeSignature( LSA_SEC_HANDLE context, ULONG quality_of_protection, + SecBufferDesc *message, ULONG message_seq_no ) +{ +#ifdef SONAME_LIBGSSAPI_KRB5 + OM_uint32 ret, minor_status; + gss_buffer_desc data_buffer, token_buffer; + gss_ctx_id_t ctxt_handle; + int data_idx, token_idx; + + TRACE( "(%lx 0x%08x %p %u)\n", context, quality_of_protection, message, message_seq_no ); + if (quality_of_protection) FIXME( "ignoring quality_of_protection 0x%08x\n", quality_of_protection ); + if (message_seq_no) FIXME( "ignoring message_seq_no %0x08x\n", message_seq_no ); + + if (!context) return SEC_E_INVALID_HANDLE; + ctxt_handle = ctxthandle_sspi_to_gss( context ); + + /* FIXME: multiple data buffers, read-only buffers */ + if ((data_idx = get_buffer_index( message, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; + data_buffer.length = message->pBuffers[data_idx].cbBuffer; + data_buffer.value = message->pBuffers[data_idx].pvBuffer; + + if ((token_idx = get_buffer_index( message, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + token_buffer.length = 0; + token_buffer.value = NULL; + + ret = pgss_get_mic( &minor_status, ctxt_handle, GSS_C_QOP_DEFAULT, &data_buffer, &token_buffer ); + TRACE( "gss_get_mic returned %08x minor status %08x\n", ret, minor_status ); + if (ret == GSS_S_COMPLETE) + { + memcpy( message->pBuffers[token_idx].pvBuffer, token_buffer.value, token_buffer.length ); + message->pBuffers[token_idx].cbBuffer = token_buffer.length; + pgss_release_buffer( &minor_status, &token_buffer ); + } + + return status_gss_to_sspi( ret ); +#else + FIXME( "(%lx 0x%08x %p %u)\n", context, quality_of_protection, message, message_seq_no ); + return SEC_E_UNSUPPORTED_FUNCTION; +#endif +} + static SECPKG_USER_FUNCTION_TABLE kerberos_user_table = { kerberos_SpInstanceInit, NULL, /* SpInitUserModeContext */ - NULL, /* SpMakeSignature */ + kerberos_SpMakeSignature, NULL, /* SpVerifySignature */ NULL, /* SpSealMessage */ NULL, /* SpUnsealMessage */ -- 2.15.1

2 1

[PATCH 3/9] kerberos: Add SpInstanceInit stub.
by Dmitry Timoshkov 25 Jan '18

25 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 4667205b61..dcf3386675 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -729,9 +729,16 @@ NTSTATUS NTAPI SpLsaModeInitialize(ULONG lsa_version, PULONG package_version, return STATUS_SUCCESS; } +static NTSTATUS NTAPI kerberos_SpInstanceInit(ULONG version, SECPKG_DLL_FUNCTIONS *dll_function_table, void **user_functions) +{ + FIXME("%u,%p,%p: stub\n", version, dll_function_table, user_functions); + + return STATUS_SUCCESS; +} + static SECPKG_USER_FUNCTION_TABLE kerberos_user_table = { - NULL, /* SpInstanceInit */ + kerberos_SpInstanceInit, NULL, /* SpInitUserModeContext */ NULL, /* SpMakeSignature */ NULL, /* SpVerifySignature */ -- 2.15.1

2 1