- Wine-Devel - list.winehq.org

[PATCH 1/4] bcrypt: Decryption with asymmetric keys is supported.
by Hans Leidekker April 20, 2021

April 20, 2021

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 40 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index a1423dcd836..6729edf671f 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1240,24 +1240,6 @@ static NTSTATUS key_symmetric_decrypt( struct key *key, UCHAR *input, ULONG inpu return status; } -static NTSTATUS key_asymmetric_decrypt( struct key *key, UCHAR *input, ULONG input_len, UCHAR *output, - ULONG output_len, ULONG *ret_len ) -{ - NTSTATUS status; - - if (!(status = key_funcs->key_asymmetric_decrypt( key, input, input_len, output, &output_len ))) - *ret_len = output_len; - - return status; -} - -static NTSTATUS key_decrypt( struct key *key, UCHAR *input, ULONG input_len, void *padding, UCHAR *iv, - ULONG iv_len, UCHAR *output, ULONG output_len, ULONG *ret_len, ULONG flags ) -{ - return key_is_symmetric( key ) ? key_symmetric_decrypt( key, input, input_len, padding, iv, iv_len, - output, output_len, ret_len, flags ) : key_asymmetric_decrypt( key, input, input_len, output, output_len, ret_len ); -} - static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYPT_KEY_HANDLE *ret_key, UCHAR *input, ULONG input_len ) { @@ -1733,6 +1715,23 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp return key_encrypt( key, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); } +static NTSTATUS key_asymmetric_decrypt( struct key *key, UCHAR *input, ULONG input_len, UCHAR *output, + ULONG output_len, ULONG *ret_len ) +{ + NTSTATUS status; + if (!(status = key_funcs->key_asymmetric_decrypt( key, input, input_len, output, &output_len ))) + *ret_len = output_len; + return status; +} + +static NTSTATUS key_decrypt( struct key *key, UCHAR *input, ULONG input_len, void *padding, UCHAR *iv, + ULONG iv_len, UCHAR *output, ULONG output_len, ULONG *ret_len, ULONG flags ) +{ + if (key_is_symmetric( key )) + return key_symmetric_decrypt( key, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); + return key_asymmetric_decrypt( key, input, input_len, output, output_len, ret_len ); +} + NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG input_len, void *padding, UCHAR *iv, ULONG iv_len, UCHAR *output, ULONG output_len, ULONG *ret_len, ULONG flags ) { @@ -1742,11 +1741,6 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp output_len, ret_len, flags ); if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; - if (!key_is_symmetric( key )) - { - FIXME( "decryption with asymmetric keys not yet supported\n" ); - return STATUS_NOT_IMPLEMENTED; - } if (flags & ~BCRYPT_BLOCK_PADDING) { FIXME( "flags %08x not supported\n", flags ); -- 2.30.2

1 0

[tools] testbot/reporttest: Update the tests to match the current Wine.
by Francois Gouget April 20, 2021

April 20, 2021

Specifically, match Wine's test renames and deletions. This avoids puzzling results in the index pages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/src/reporttest/report.template | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index f1dbfd618..6af2ff506 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -423,20 +423,20 @@ comctl32:button skipped dlls/comctl32/tests/button.c ----- Skipping a test unit by user request ----- Expected assessement: Skipped by user -comctl32:comboex start dlls/comctl32/tests/comboex.c +comctl32:combo start dlls/comctl32/tests/combo.c ----- WTBS Simple success in a todo test ----- WTBS Simple trace, ok, todo, skip sampler ----- A test unit with a subprocess and failed, todo and skipped tests in the ----- main process. ----- Expected assessement: 2 failures, 1 todo, 1 skip -comboex.c:40: Test failed: A failure in the main process -comboex.c:41: Test succeeded inside todo block: Success in the main process -comboex.c:42: Test marked todo: Fixme in the main process -comboex.c:43: Tests skipped: Skipped in the main process +combo.c:40: Test failed: A failure in the main process +combo.c:41: Test succeeded inside todo block: Success in the main process +combo.c:42: Test marked todo: Fixme in the main process +combo.c:43: Tests skipped: Skipped in the main process This line says nothing is wrong because it's from the subprocess -1234:comboex: 116 tests executed (0 marked as todo, 0 failures), 0 skipped. -0c9c:comboex: 116 tests executed (1 marked as todo, 2 failures), 1 skipped. -comctl32:comboex:0c9c done (2) in 0s +1234:combo: 116 tests executed (0 marked as todo, 0 failures), 0 skipped. +0c9c:combo: 116 tests executed (1 marked as todo, 2 failures), 1 skipped. +comctl32:combo:0c9c done (2) in 0s comctl32:datetime start dlls/comctl32/tests/datetime.c ----- A test unit reporting a failure but with no test failed line @@ -874,7 +874,6 @@ stub msvcrt:data stub msvcrt:dir stub msvcrt:environ stub msvcrt:file -stub msvcrt:headers stub msvcrt:heap stub msvcrt:locale stub msvcrt:misc @@ -962,17 +961,16 @@ stub qmgr:enum_jobs stub qmgr:file stub qmgr:job stub qmgr:qmgr -stub quartz:avisplitter +stub quartz:avisplit stub quartz:dsoundrender stub quartz:filtergraph stub quartz:filtermapper stub quartz:memallocator -stub quartz:misc stub quartz:mpegsplit -stub quartz:referenceclock +stub quartz:systemclock stub quartz:videorenderer stub rasapi32:rasapi -stub reg.exe:reg +stub reg.exe:add stub regedit.exe:regedit stub riched20:editor stub riched20:richole -- 2.20.1

1 0

[tools] winetest/dissect: Fix handling of skipped test unit.
by Francois Gouget April 20, 2021

April 20, 2021

close_test_unit() adds an entry in summary.txt for every test unit. So the report parser must set $summary instead of manually adding a redundant summary.txt entry. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This caused skipped tests to appear as '0 failures' in the index pages instead of 'skipped'. That's because close_test_unit() was adding an extra 'not-skipped' entry in summary.txt. --- winetest/dissect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/dissect b/winetest/dissect index c58e47f57..ce3329ea6 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -627,7 +627,7 @@ while ($line = <IN>) { if ($l_type eq "skipped") { add_test_line("skipped", "Skipped by user request"); - print SUM "- $dll $unit skipped - - - $source\n"; + $summary = "skipped - - -"; mydie "too many test units skipped by user request (>$maxuserskips at $dll:$unit)" if ++$skipped_units > $maxuserskips; $rc = 0; } -- 2.20.1

1 0

[tools] winetest: Position the up/down arrows with CSS instead of a table.
by Francois Gouget April 20, 2021

April 20, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/dissect | 8 ++++---- winetest/report.css | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 2d0e9c214..c58e47f57 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -929,10 +929,10 @@ print REPORT "</div>\n"; for (my $i = 0; $i <= $#boxes; $i++) { printf REPORT "<div id=\"%s\" class=\"%s\">\n", $boxes[$i]->{id}, $boxes[$i]->{class}; - printf REPORT "<div class=\"updownbar\"><table><tr><td width=\"100%%\">%s</td>\n", $boxes[$i]->{title}; - printf REPORT "<td class=\"arrow\"><a href=\"#%s\">↑</a></td>\n", $boxes[$i]->{prev} if defined $boxes[$i]->{prev}; - printf REPORT "<td class=\"arrow\"><a href=\"#%s\">↓</a></td>\n", $boxes[$i]->{next} if defined $boxes[$i]->{next}; - print REPORT "</tr></table></div>\n"; + printf REPORT "<div class=\"updownbar\">%s<div class='ralign'>", $boxes[$i]->{title}; + printf REPORT "<a href=\"#%s\">↑</a>", $boxes[$i]->{prev} if defined $boxes[$i]->{prev}; + printf REPORT "<a href=\"#%s\">↓</a>", $boxes[$i]->{next} if defined $boxes[$i]->{next}; + print REPORT "</div></div>\n"; print REPORT $boxes[$i]->{data}, "</div>\n"; } print REPORT end_html(); diff --git a/winetest/report.css b/winetest/report.css index 3cb2e98db..bcb1f09e5 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -63,3 +63,8 @@ table.output td { td.arrow :link { color: #ffffff; text-decoration: none; } td.arrow :visited { color: #ffffff; text-decoration: none; } td.arrow :hover { color: #ffffff; text-decoration: underline; } + +.ralign { + display: inline-block; + float: right; +} -- 2.20.1

1 0

[tools] winetest/css: Fix the color of links on index page titles.
by Francois Gouget April 20, 2021

April 20, 2021

The color and decorations must be specified for the hover and visited cases too. Also add support for putting links in h2 titles. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- The TestBot uses a different color for its titles. But then they don't have links (except for the up/down arrows). Maybe this should be standardised... winetest/summary.css | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/winetest/summary.css b/winetest/summary.css index 2bc9b4435..9793cdf5a 100644 --- a/winetest/summary.css +++ b/winetest/summary.css @@ -27,9 +27,10 @@ h1, h2 { padding: 4px; margin: 0; } -h1 :link { - color: #ffe0e0; -} +h1 :link, h2 :link { color: #ffe0e0; } +h1 a:visited, h2 a:visited { color: #ffe0e0; } +h1 a:hover, h2 a:hover { color: #ffe0e0; text-decoration: underline; } + div.main, div.group { margin: 10px 0 0 0; background-color: white; -- 2.20.1

1 0

[tools] winetest/css: Fix the div.updownbar index pages' CSS style.
by Francois Gouget April 20, 2021

April 20, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Of course after the semi-colon is no longer missing the padding and margins were wrong. --- winetest/report.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/winetest/report.css b/winetest/report.css index bcb1f09e5..41b0b049a 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -29,8 +29,7 @@ div.output, div.test { } div.updownbar { - padding: 10px - margin-top: 10px; + padding: 4px; margin-bottom: 5px; font-size: large; background-color: #601919; -- 2.20.1

1 0

[PATCH] wined3d: Prevent buildup of retired buffer objects' memory.
by Jan Sikorski April 20, 2021

April 20, 2021

Submit current command buffer in wined3d_context_vk_get_command_buffer() and return a new one if the total size of retired buffer objects on that command buffer crosses a predefined threshold. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 15 ++++++++++++--- dlls/wined3d/wined3d_private.h | 2 ++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 45133eabb69..89706d455f5 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -921,6 +921,9 @@ void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const if (bo->map_ptr) VK_CALL(vkUnmapMemory(device_vk->vk_device, bo->vk_memory)); wined3d_context_vk_destroy_vk_memory(context_vk, bo->vk_memory, bo->command_buffer_id); + + if (bo->command_buffer_id == context_vk->current_command_buffer.id) + context_vk->retired_bo_counter += bo->size; } void wined3d_context_vk_poll_command_buffers(struct wined3d_context_vk *context_vk) @@ -1509,9 +1512,14 @@ VkCommandBuffer wined3d_context_vk_get_command_buffer(struct wined3d_context_vk buffer = &context_vk->current_command_buffer; if (buffer->vk_command_buffer) { - TRACE("Returning existing command buffer %p with id 0x%s.\n", - buffer->vk_command_buffer, wine_dbgstr_longlong(buffer->id)); - return buffer->vk_command_buffer; + if (context_vk->retired_bo_counter > WINED3D_RETIRED_BO_COUNTER_THRESHOLD) + wined3d_context_vk_submit_command_buffer(context_vk, 0, NULL, NULL, 0, NULL); + else + { + TRACE("Returning existing command buffer %p with id 0x%s.\n", + buffer->vk_command_buffer, wine_dbgstr_longlong(buffer->id)); + return buffer->vk_command_buffer; + } } command_buffer_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO; @@ -1628,6 +1636,7 @@ void wined3d_context_vk_submit_command_buffer(struct wined3d_context_vk *context context_vk->completed_command_buffer_id = 0; buffer->id = 1; } + context_vk->retired_bo_counter = 0; wined3d_context_vk_cleanup_resources(context_vk); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c3e3752ed71..694436ddad2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2549,6 +2549,8 @@ struct wined3d_context_vk VkCommandPool vk_command_pool; struct wined3d_command_buffer_vk current_command_buffer; uint64_t completed_command_buffer_id; +#define WINED3D_RETIRED_BO_COUNTER_THRESHOLD (64 << 20) + size_t retired_bo_counter; struct { -- 2.31.0

2 3

[PATCH] wldap32: Remove redundant 'break' statement.
by Andrey Gusev April 20, 2021

April 20, 2021

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/wldap32/option.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/wldap32/option.c b/dlls/wldap32/option.c index 1037b73174b..9c9281fdbcd 100644 --- a/dlls/wldap32/option.c +++ b/dlls/wldap32/option.c @@ -469,7 +469,6 @@ ULONG CDECL ldap_set_optionW( LDAP *ld, int option, void *value ) else FIXME("upgrading referral value %p to LDAP_OPT_ON (OpenLDAP lacks sufficient granularity)\n", value); return map_error( ldap_funcs->fn_ldap_set_option( CTX(ld), option, openldap_referral ) ); - break; } case LDAP_OPT_DEREF: case LDAP_OPT_DESC: -- 2.30.2

1 0

[PATCH v2 5/5] kerberos: Move support for SpVerifySignature to the Unix library.
by Hans Leidekker April 20, 2021

April 20, 2021

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/kerberos/krb5_ap.c | 27 +-------------------------- dlls/kerberos/unixlib.c | 24 ++++++++++++++++++++++++ dlls/kerberos/unixlib.h | 1 + 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 998a1cd7636..faeabfb07c9 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -1075,36 +1075,11 @@ static NTSTATUS SEC_ENTRY kerberos_SpMakeSignature( LSA_SEC_HANDLE context, ULON static NTSTATUS NTAPI 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 %u\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 (GSS_ERROR(ret)) trace_gss_status( 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 + return krb5_funcs->verify_signature( context, message, quality_of_protection ); } #ifdef SONAME_LIBGSSAPI_KRB5 diff --git a/dlls/kerberos/unixlib.c b/dlls/kerberos/unixlib.c index f67f22ad8d8..06f0ffc8a04 100644 --- a/dlls/kerberos/unixlib.c +++ b/dlls/kerberos/unixlib.c @@ -587,6 +587,29 @@ static NTSTATUS CDECL make_signature( LSA_SEC_HANDLE context, SecBufferDesc *msg return status_gss_to_sspi( ret ); } +static NTSTATUS CDECL verify_signature( LSA_SEC_HANDLE context, SecBufferDesc *msg, ULONG *qop ) +{ + OM_uint32 ret, minor_status; + gss_buffer_desc data_buffer, token_buffer; + gss_ctx_id_t ctx_handle = ctxhandle_sspi_to_gss( context ); + int data_idx, token_idx; + + if ((data_idx = get_buffer_index( msg, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; + data_buffer.length = msg->pBuffers[data_idx].cbBuffer; + data_buffer.value = msg->pBuffers[data_idx].pvBuffer; + + if ((token_idx = get_buffer_index( msg, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + token_buffer.length = msg->pBuffers[token_idx].cbBuffer; + token_buffer.value = msg->pBuffers[token_idx].pvBuffer; + + ret = pgss_verify_mic( &minor_status, ctx_handle, &data_buffer, &token_buffer, NULL ); + TRACE( "gss_verify_mic 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 = 0; + + return status_gss_to_sspi( ret ); +} + static const struct krb5_funcs funcs = { accept_context, @@ -595,6 +618,7 @@ static const struct krb5_funcs funcs = free_credentials_handle, initialize_context, make_signature, + verify_signature, }; NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ) diff --git a/dlls/kerberos/unixlib.h b/dlls/kerberos/unixlib.h index da487bb781e..6a73444aae8 100644 --- a/dlls/kerberos/unixlib.h +++ b/dlls/kerberos/unixlib.h @@ -30,6 +30,7 @@ struct krb5_funcs NTSTATUS (CDECL *initialize_context)(LSA_SEC_HANDLE, LSA_SEC_HANDLE, const char *, ULONG, SecBufferDesc *, LSA_SEC_HANDLE *, SecBufferDesc *, ULONG *, TimeStamp *); NTSTATUS (CDECL *make_signature)(LSA_SEC_HANDLE, SecBufferDesc *); + NTSTATUS (CDECL *verify_signature)(LSA_SEC_HANDLE, SecBufferDesc *, ULONG *); }; extern const struct krb5_funcs *krb5_funcs; -- 2.30.2

1 0

[PATCH v2 4/5] kerberos: Move support for SpMakeSignature to the Unix library.
by Hans Leidekker April 20, 2021

April 20, 2021

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/kerberos/krb5_ap.c | 35 +---------------------------------- dlls/kerberos/unixlib.c | 30 ++++++++++++++++++++++++++++++ dlls/kerberos/unixlib.h | 1 + 3 files changed, 32 insertions(+), 34 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 176546d9e1d..998a1cd7636 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -1052,57 +1052,24 @@ NTSTATUS NTAPI SpLsaModeInitialize(ULONG lsa_version, PULONG package_version, *package_version = SECPKG_INTERFACE_VERSION; *table = &kerberos_table; *table_count = 1; - return STATUS_SUCCESS; } static NTSTATUS NTAPI kerberos_SpInstanceInit(ULONG version, SECPKG_DLL_FUNCTIONS *dll_function_table, void **user_functions) { TRACE("%#x,%p,%p\n", version, dll_function_table, user_functions); - 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 %u\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 (GSS_ERROR(ret)) trace_gss_status( 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 + return krb5_funcs->make_signature( context, message ); } static NTSTATUS NTAPI kerberos_SpVerifySignature( LSA_SEC_HANDLE context, SecBufferDesc *message, diff --git a/dlls/kerberos/unixlib.c b/dlls/kerberos/unixlib.c index 04bff0b032e..f67f22ad8d8 100644 --- a/dlls/kerberos/unixlib.c +++ b/dlls/kerberos/unixlib.c @@ -558,6 +558,35 @@ static NTSTATUS CDECL initialize_context( LSA_SEC_HANDLE credential, LSA_SEC_HAN return status_gss_to_sspi( ret ); } +static NTSTATUS CDECL make_signature( LSA_SEC_HANDLE context, SecBufferDesc *msg ) +{ + OM_uint32 ret, minor_status; + gss_buffer_desc data_buffer, token_buffer; + gss_ctx_id_t ctx_handle = ctxhandle_sspi_to_gss( context ); + int data_idx, token_idx; + + /* FIXME: multiple data buffers, read-only buffers */ + if ((data_idx = get_buffer_index( msg, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; + data_buffer.length = msg->pBuffers[data_idx].cbBuffer; + data_buffer.value = msg->pBuffers[data_idx].pvBuffer; + + if ((token_idx = get_buffer_index( msg, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + token_buffer.length = 0; + token_buffer.value = NULL; + + ret = pgss_get_mic( &minor_status, ctx_handle, GSS_C_QOP_DEFAULT, &data_buffer, &token_buffer ); + TRACE( "gss_get_mic 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, token_buffer.value, token_buffer.length ); + msg->pBuffers[token_idx].cbBuffer = token_buffer.length; + pgss_release_buffer( &minor_status, &token_buffer ); + } + + return status_gss_to_sspi( ret ); +} + static const struct krb5_funcs funcs = { accept_context, @@ -565,6 +594,7 @@ static const struct krb5_funcs funcs = delete_context, free_credentials_handle, initialize_context, + make_signature, }; NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ) diff --git a/dlls/kerberos/unixlib.h b/dlls/kerberos/unixlib.h index 88d13ce8aab..da487bb781e 100644 --- a/dlls/kerberos/unixlib.h +++ b/dlls/kerberos/unixlib.h @@ -29,6 +29,7 @@ struct krb5_funcs NTSTATUS (CDECL *free_credentials_handle)(LSA_SEC_HANDLE); NTSTATUS (CDECL *initialize_context)(LSA_SEC_HANDLE, LSA_SEC_HANDLE, const char *, ULONG, SecBufferDesc *, LSA_SEC_HANDLE *, SecBufferDesc *, ULONG *, TimeStamp *); + NTSTATUS (CDECL *make_signature)(LSA_SEC_HANDLE, SecBufferDesc *); }; extern const struct krb5_funcs *krb5_funcs; -- 2.30.2

1 0