wine-commits March 2021

wine-commits@winehq.org

2 participants
1163 discussions

Hugh McMaster : reg/tests: Try exporting registry values with escaped null characters.
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: 53fd4df85f004597161a26d86333755e7cbff0ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=53fd4df85f004597161a26d8… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Mar 10 23:25:22 2021 +1100 reg/tests: Try exporting registry values with escaped null characters. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/export.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/programs/reg/tests/export.c b/programs/reg/tests/export.c index 32c99e36376..2c7ba88fb59 100644 --- a/programs/reg/tests/export.c +++ b/programs/reg/tests/export.c @@ -168,6 +168,16 @@ static void test_export(void) "\"\\\\foo\\\\bar\"=\"\"\r\n\r\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\https://winehq.org]\r\n\r\n"; + const char *escaped_null_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" + "\"Wine5a\"=\"\\\\0\"\r\n" + "\"Wine5b\"=\"\\\\0\\\\0\"\r\n" + "\"Wine5c\"=\"Value1\\\\0\"\r\n" + "\"Wine5d\"=\"Value2\\\\0\\\\0\\\\0\\\\0\"\r\n" + "\"Wine5e\"=\"Value3\\\\0Value4\"\r\n" + "\"Wine5f\"=\"\\\\0Value5\"\r\n\r\n"; + delete_tree(HKEY_CURRENT_USER, KEY_BASE); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); @@ -402,6 +412,21 @@ static void test_export(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", slashes_test, TODO_REG_COMPARE), "compare_export() failed\n"); delete_tree(HKEY_CURRENT_USER, KEY_BASE); + + /* Test escaped null characters */ + add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); + add_value(hkey, "Wine5a", REG_SZ, "\\0", 3); + add_value(hkey, "Wine5b", REG_SZ, "\\0\\0", 5); + add_value(hkey, "Wine5c", REG_SZ, "Value1\\0", 9); + add_value(hkey, "Wine5d", REG_SZ, "Value2\\0\\0\\0\\0", 15); + add_value(hkey, "Wine5e", REG_SZ, "Value3\\0Value4", 15); + add_value(hkey, "Wine5f", REG_SZ, "\\0Value5", 9); + close_key(hkey); + + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("file.reg", escaped_null_test, 0), "compare_export() failed\n"); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); } START_TEST(export)

1 0

Hugh McMaster : reg/tests: Try importing registry files with escaped null characters.
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: 1c2b96699973e198e72a01a969af0876387f08e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c2b96699973e198e72a01a9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Mar 10 23:25:21 2021 +1100 reg/tests: Try importing registry files with escaped null characters. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/import.c | 50 ++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/programs/reg/tests/import.c b/programs/reg/tests/import.c index 9b7a90ac99c..f8e7e4b7acb 100644 --- a/programs/reg/tests/import.c +++ b/programs/reg/tests/import.c @@ -1574,22 +1574,22 @@ static void test_import(void) verify_reg(hkey, "Wine68h", REG_BINARY, NULL, 0, 0); verify_reg(hkey, "Wine68i", REG_NONE, NULL, 0, 0); - /* Test with embedded null characters */ + /* Test with escaped null characters */ test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "\"Wine69a\"=\"\\0\n" - "\"Wine69b\"=\"\\0\\0\n" - "\"Wine69c\"=\"Value1\\0\n" - "\"Wine69d\"=\"Value2\\0\\0\\0\\0\n" - "\"Wine69e\"=\"Value3\\0Value4\n" - "\"Wine69f\"=\"\\0Value5\n\n", &r); + "\"Wine69a\"=\"\\\\0\"\n" + "\"Wine69b\"=\"\\\\0\\\\0\"\n" + "\"Wine69c\"=\"Value1\\\\0\"\n" + "\"Wine69d\"=\"Value2\\\\0\\\\0\\\\0\\\\0\"\n" + "\"Wine69e\"=\"Value3\\\\0Value4\"\n" + "\"Wine69f\"=\"\\\\0Value5\"\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_reg_nonexist(hkey, "Wine69a"); - verify_reg_nonexist(hkey, "Wine69b"); - verify_reg_nonexist(hkey, "Wine69c"); - verify_reg_nonexist(hkey, "Wine69d"); - verify_reg_nonexist(hkey, "Wine69e"); - verify_reg_nonexist(hkey, "Wine69f"); + verify_reg(hkey, "Wine69a", REG_SZ, "\\0", 3, 0); + verify_reg(hkey, "Wine69b", REG_SZ, "\\0\\0", 5, 0); + verify_reg(hkey, "Wine69c", REG_SZ, "Value1\\0", 9, 0); + verify_reg(hkey, "Wine69d", REG_SZ, "Value2\\0\\0\\0\\0", 15, 0); + verify_reg(hkey, "Wine69e", REG_SZ, "Value3\\0Value4", 15, 0); + verify_reg(hkey, "Wine69f", REG_SZ, "\\0Value5", 9, 0); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -3126,19 +3126,19 @@ static void test_unicode_import(void) /* Test with embedded null characters */ test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "\"Wine69a\"=\"\\0\n" - "\"Wine69b\"=\"\\0\\0\n" - "\"Wine69c\"=\"Value1\\0\n" - "\"Wine69d\"=\"Value2\\0\\0\\0\\0\n" - "\"Wine69e\"=\"Value3\\0Value4\n" - "\"Wine69f\"=\"\\0Value5\n\n", &r); + "\"Wine69a\"=\"\\\\0\"\n" + "\"Wine69b\"=\"\\\\0\\\\0\"\n" + "\"Wine69c\"=\"Value1\\\\0\"\n" + "\"Wine69d\"=\"Value2\\\\0\\\\0\\\\0\\\\0\"\n" + "\"Wine69e\"=\"Value3\\\\0Value4\"\n" + "\"Wine69f\"=\"\\\\0Value5\"\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_reg_nonexist(hkey, "Wine69a"); - verify_reg_nonexist(hkey, "Wine69b"); - verify_reg_nonexist(hkey, "Wine69c"); - verify_reg_nonexist(hkey, "Wine69d"); - verify_reg_nonexist(hkey, "Wine69e"); - verify_reg_nonexist(hkey, "Wine69f"); + verify_reg(hkey, "Wine69a", REG_SZ, "\\0", 3, 0); + verify_reg(hkey, "Wine69b", REG_SZ, "\\0\\0", 5, 0); + verify_reg(hkey, "Wine69c", REG_SZ, "Value1\\0", 9, 0); + verify_reg(hkey, "Wine69d", REG_SZ, "Value2\\0\\0\\0\\0", 15, 0); + verify_reg(hkey, "Wine69e", REG_SZ, "Value3\\0Value4", 15, 0); + verify_reg(hkey, "Wine69f", REG_SZ, "\\0Value5", 9, 0); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0

Hugh McMaster : reg/tests: Try deleting strings containing escaped null characters.
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: aa98e3f6da78135ecffaa50bb78ad906dfd4570d URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa98e3f6da78135ecffaa50b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Mar 10 23:25:20 2021 +1100 reg/tests: Try deleting strings containing escaped null characters. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/delete.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/programs/reg/tests/delete.c b/programs/reg/tests/delete.c index fff3c5348b8..ee2257d42c5 100644 --- a/programs/reg/tests/delete.c +++ b/programs/reg/tests/delete.c @@ -100,6 +100,22 @@ static void test_delete(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg_nonexist(hkey, "\\foo\\bar"); + add_value(hkey, "string\\01", REG_SZ, "Value", 6); + add_value(hkey, "string2", REG_SZ, "foo\\0bar", 9); + add_value(hkey, "\\0", REG_SZ, "Value", 6); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v string\\01 /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "string\\01"); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v string2 /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "string2"); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v \\0 /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "\\0"); + close_key(hkey); run_reg_exe("reg delete HKCU\\" KEY_BASE " /f", &r);

1 0

Francois Gouget : winetest: Avoid duplicating the extract_test_proc() cleanup code.
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: e9a0eeff41675597e8ccd7daa7d62681c5a32d11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9a0eeff41675597e8ccd7da… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 10 18:15:58 2021 +0100 winetest: Avoid duplicating the extract_test_proc() cleanup code. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 54 ++++++++++++++++++++---------------------------- 1 file changed, 22 insertions(+), 32 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 1731850bfdb..408e1b3c706 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -890,6 +890,7 @@ extract_test_proc (HMODULE hModule, LPCSTR lpszType, LPSTR lpszName, LONG_PTR lP DWORD err; HANDLE actctx; ULONG_PTR cookie; + BOOL run; if (aborting) return TRUE; @@ -941,50 +942,39 @@ extract_test_proc (HMODULE hModule, LPCSTR lpszType, LPSTR lpszName, LONG_PTR lP else dll = 0; } + run = TRUE; if (!dll) { xprintf (" %s=dll is missing\n", dllname); - if (actctx != INVALID_HANDLE_VALUE) - { - pDeactivateActCtx(0, cookie); - pReleaseActCtx(actctx); - } - return TRUE; + run = FALSE; } - if(is_stub_dll(dllname)) + else { - FreeLibrary(dll); - xprintf (" %s=dll is a stub\n", dllname); - if (actctx != INVALID_HANDLE_VALUE) + if (is_stub_dll(dllname)) { - pDeactivateActCtx(0, cookie); - pReleaseActCtx(actctx); + xprintf (" %s=dll is a stub\n", dllname); + run = FALSE; } - return TRUE; - } - if (is_native_dll(dll)) - { - FreeLibrary(dll); - xprintf (" %s=load error Configured as native\n", dllname); - nr_native_dlls++; - if (actctx != INVALID_HANDLE_VALUE) + else if (is_native_dll(dll)) { - pDeactivateActCtx(0, cookie); - pReleaseActCtx(actctx); + xprintf (" %s=load error Configured as native\n", dllname); + nr_native_dlls++; + run = FALSE; } - return TRUE; + FreeLibrary(dll); } - FreeLibrary(dll); - if (!(err = get_subtests( tempdir, &wine_tests[nr_of_files], lpszName ))) + if (run) { - xprintf (" %s=%s\n", dllname, get_file_version(filename)); - nr_of_tests += wine_tests[nr_of_files].subtest_count; - nr_of_files++; - } - else - { - xprintf (" %s=load error %u\n", dllname, err); + err = get_subtests( tempdir, &wine_tests[nr_of_files], lpszName ); + if (!err) + { + xprintf (" %s=%s\n", dllname, get_file_version(filename)); + nr_of_tests += wine_tests[nr_of_files].subtest_count; + nr_of_files++; + } + else + xprintf (" %s=load error %u\n", dllname, err); } if (actctx != INVALID_HANDLE_VALUE)

1 0

Hans Leidekker : secur32: Return more attributes from schan_InitializeSecurityContextW.
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: ed06d64bf41cc3eb6258a3576e845a544855b0be URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed06d64bf41cc3eb6258a357… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 10 15:50:28 2021 +0100 secur32: Return more attributes from schan_InitializeSecurityContextW. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index e7673a7f814..1dd3a029401 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -958,10 +958,11 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( } *pfContextAttr = ISC_RET_REPLAY_DETECT | ISC_RET_SEQUENCE_DETECT | ISC_RET_CONFIDENTIALITY | ISC_RET_STREAM; - if (ctx->req_ctx_attr & ISC_REQ_ALLOCATE_MEMORY) - *pfContextAttr |= ISC_RET_ALLOCATED_MEMORY; - if (ctx->req_ctx_attr & ISC_REQ_USE_SUPPLIED_CREDS) - *pfContextAttr |= ISC_RET_USED_SUPPLIED_CREDS; + if (ctx->req_ctx_attr & ISC_REQ_EXTENDED_ERROR) *pfContextAttr |= ISC_RET_EXTENDED_ERROR; + if (ctx->req_ctx_attr & ISC_REQ_DATAGRAM) *pfContextAttr |= ISC_RET_DATAGRAM; + if (ctx->req_ctx_attr & ISC_REQ_ALLOCATE_MEMORY) *pfContextAttr |= ISC_RET_ALLOCATED_MEMORY; + if (ctx->req_ctx_attr & ISC_REQ_USE_SUPPLIED_CREDS) *pfContextAttr |= ISC_RET_USED_SUPPLIED_CREDS; + if (ctx->req_ctx_attr & ISC_REQ_MANUAL_CRED_VALIDATION) *pfContextAttr |= ISC_RET_MANUAL_CRED_VALIDATION; return ret; }

1 0

Hans Leidekker : secur32: Add support for setting DTLS MTU.
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: a114ce67db2357740eb58fbda0102e582e79c11c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a114ce67db2357740eb58fbd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 10 15:50:27 2021 +0100 secur32: Add support for setting DTLS MTU. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 7 +++++++ dlls/secur32/schannel_gnutls.c | 20 ++++++++++++++++++++ dlls/secur32/schannel_macosx.c | 6 ++++++ dlls/secur32/secur32_priv.h | 1 + 4 files changed, 34 insertions(+) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 9a1dfd42152..e7673a7f814 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -879,6 +879,13 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( schan_imp_set_application_protocols(ctx->session, buffer->pvBuffer, buffer->cbBuffer); } + if (pInput && (idx = schan_find_sec_buffer_idx(pInput, 0, SECBUFFER_DTLS_MTU)) != -1) + { + buffer = &pInput->pBuffers[idx]; + if (buffer->cbBuffer >= sizeof(WORD)) schan_imp_set_dtls_mtu(ctx->session, *(WORD *)buffer->pvBuffer); + else WARN("invalid buffer size %u\n", buffer->cbBuffer); + } + phNewContext->dwLower = handle; phNewContext->dwUpper = 0; } diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index fbf9277a39c..785430ddf58 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -53,6 +53,7 @@ static int (*pgnutls_cipher_get_block_size)(gnutls_cipher_algorithm_t); /* Not present in gnutls version < 3.0. */ static void (*pgnutls_transport_set_pull_timeout_function)(gnutls_session_t, int (*)(gnutls_transport_ptr_t, unsigned int)); +static void (*pgnutls_dtls_set_mtu)(gnutls_session_t, unsigned int); /* Not present in gnutls version < 3.2.0. */ static int (*pgnutls_alpn_get_selected_protocol)(gnutls_session_t, gnutls_datum_t *); @@ -186,6 +187,11 @@ static int compat_gnutls_alpn_set_protocols(gnutls_session_t session, const gnut return GNUTLS_E_INVALID_REQUEST; } +static void compat_gnutls_dtls_set_mtu(gnutls_session_t session, unsigned int mtu) +{ + FIXME("\n"); +} + static ssize_t schan_pull_adapter(gnutls_transport_ptr_t transport, void *buff, size_t buff_len) { @@ -767,6 +773,15 @@ SECURITY_STATUS schan_imp_get_application_protocol(schan_imp_session session, return SEC_E_OK; } +SECURITY_STATUS schan_imp_set_dtls_mtu(schan_imp_session session, unsigned int mtu) +{ + gnutls_session_t s = (gnutls_session_t)session; + + pgnutls_dtls_set_mtu(s, mtu); + TRACE("MTU set to %u\n", mtu); + return SEC_E_OK; +} + static WCHAR *get_key_container_path(const CERT_CONTEXT *ctx) { static const WCHAR rsabaseW[] = @@ -1130,6 +1145,11 @@ BOOL schan_imp_init(void) WARN("gnutls_alpn_get_selected_protocol not found\n"); pgnutls_alpn_get_selected_protocol = compat_gnutls_alpn_get_selected_protocol; } + if (!(pgnutls_dtls_set_mtu = dlsym(libgnutls_handle, "gnutls_dtls_set_mtu"))) + { + WARN("gnutls_dtls_set_mtu not found\n"); + pgnutls_dtls_set_mtu = compat_gnutls_dtls_set_mtu; + } if (!(pgnutls_privkey_export_x509 = dlsym(libgnutls_handle, "gnutls_privkey_export_x509"))) { WARN("gnutls_privkey_export_x509 not found\n"); diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index 6e6296722cc..ab97615014d 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -1213,6 +1213,12 @@ SECURITY_STATUS schan_imp_get_application_protocol(schan_imp_session session, return SEC_E_UNSUPPORTED_FUNCTION; } +SECURITY_STATUS schan_imp_set_dtls_mtu(schan_imp_session session, unsigned int mtu) +{ + FIXME("no support for setting dtls mtu on this platform\n"); + return SEC_E_UNSUPPORTED_FUNCTION; +} + BOOL schan_imp_init(void) { TRACE("()\n"); diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index ce8d55d1eb6..ca0062056d6 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -253,5 +253,6 @@ extern void schan_imp_deinit(void) DECLSPEC_HIDDEN; extern void schan_imp_set_application_protocols(schan_imp_session, unsigned char *, unsigned int) DECLSPEC_HIDDEN; extern SECURITY_STATUS schan_imp_get_application_protocol(schan_imp_session, SecPkgContext_ApplicationProtocol *) DECLSPEC_HIDDEN; +extern SECURITY_STATUS schan_imp_set_dtls_mtu(schan_imp_session, unsigned int) DECLSPEC_HIDDEN; #endif /* ndef __SECUR32_PRIV_H__ */

1 0

Hans Leidekker : secur32: Add DTLS support.
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: f93284dfa44b060436c6a0617b51280abb3f24fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=f93284dfa44b060436c6a061… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 10 15:50:26 2021 +0100 secur32: Add DTLS support. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 89 ++++++++++++++++++++++++++---------------- dlls/secur32/schannel_gnutls.c | 39 +++++++++++++++++- 2 files changed, 92 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f93284dfa44b060436c6…

1 0

Hans Leidekker : secur32: Add a helper to read TLS record size.
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: 37b29862b36364c6fee143de5eb816bcae514279 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37b29862b36364c6fee143de… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 10 15:50:25 2021 +0100 secur32: Add a helper to read TLS record size. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index d47c4d79258..3a34007a8cb 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -772,6 +772,13 @@ static void dump_buffer_desc(SecBufferDesc *desc) } } +#define HEADER_SIZE_TLS 5 + +static inline SIZE_T read_record_size(const BYTE *buf, SIZE_T header_size) +{ + return (buf[header_size - 2] << 8) | buf[header_size - 1]; +} + /*********************************************************************** * InitializeSecurityContextW */ @@ -870,9 +877,9 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( ptr = buffer->pvBuffer; expected_size = 0; - while (buffer->cbBuffer > expected_size + 5) + while (buffer->cbBuffer > expected_size + HEADER_SIZE_TLS) { - record_size = 5 + ((ptr[3] << 8) | ptr[4]); + record_size = HEADER_SIZE_TLS + read_record_size(ptr, HEADER_SIZE_TLS); if (buffer->cbBuffer < expected_size + record_size) break; @@ -1035,7 +1042,7 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesW( mac_size, message_size, block_size); /* These are defined by the TLS RFC */ - stream_sizes->cbHeader = 5; + stream_sizes->cbHeader = HEADER_SIZE_TLS; stream_sizes->cbTrailer = mac_size + 256; /* Max 255 bytes padding + 1 for padding size */ stream_sizes->cbMaximumMessage = message_size; stream_sizes->cbBuffers = 4; @@ -1360,7 +1367,7 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle buffer = &message->pBuffers[idx]; buf_ptr = buffer->pvBuffer; - expected_size = 5 + ((buf_ptr[3] << 8) | buf_ptr[4]); + expected_size = HEADER_SIZE_TLS + read_record_size(buf_ptr, HEADER_SIZE_TLS); if(buffer->cbBuffer < expected_size) { TRACE("Expected %u bytes, but buffer only contains %u bytes\n", expected_size, buffer->cbBuffer); @@ -1377,7 +1384,7 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle return SEC_E_INCOMPLETE_MESSAGE; } - data_size = expected_size - 5; + data_size = expected_size - HEADER_SIZE_TLS; data = heap_alloc(data_size); init_schan_buffers(&ctx->transport.in, message, schan_decrypt_message_get_next_buffer); @@ -1412,21 +1419,21 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle TRACE("Received %ld bytes\n", received); - memcpy(buf_ptr + 5, data, received); + memcpy(buf_ptr + HEADER_SIZE_TLS, data, received); heap_free(data); schan_decrypt_fill_buffer(message, SECBUFFER_DATA, - buf_ptr + 5, received); + buf_ptr + HEADER_SIZE_TLS, received); schan_decrypt_fill_buffer(message, SECBUFFER_STREAM_TRAILER, - buf_ptr + 5 + received, buffer->cbBuffer - 5 - received); + buf_ptr + HEADER_SIZE_TLS + received, buffer->cbBuffer - HEADER_SIZE_TLS - received); if(buffer->cbBuffer > expected_size) schan_decrypt_fill_buffer(message, SECBUFFER_EXTRA, buf_ptr + expected_size, buffer->cbBuffer - expected_size); buffer->BufferType = SECBUFFER_STREAM_HEADER; - buffer->cbBuffer = 5; + buffer->cbBuffer = HEADER_SIZE_TLS; return status; }

1 0

Hans Leidekker : include: Add missing SECBUFFER defines.
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: 4be05213943d8b522d47e3706614175f531197d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4be05213943d8b522d47e370… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 10 15:50:24 2021 +0100 include: Add missing SECBUFFER defines. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/sspi.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/sspi.h b/include/sspi.h index e7371f129de..1cd1e6e0035 100644 --- a/include/sspi.h +++ b/include/sspi.h @@ -201,7 +201,9 @@ typedef struct _SecBuffer #define SECBUFFER_MECHLIST_SIGNATURE 12 #define SECBUFFER_TARGET 13 #define SECBUFFER_CHANNEL_BINDINGS 14 +#define SECBUFFER_ALERT 17 #define SECBUFFER_APPLICATION_PROTOCOLS 18 +#define SECBUFFER_DTLS_MTU 24 #define SECBUFFER_ATTRMASK 0xf0000000 #define SECBUFFER_READONLY 0x80000000

1 0

Jacek Caban : jscript: Improve prop_get and prop_put debug traces.
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: 492b65df1f764219790c83ffb3f1dbebfaace5e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=492b65df1f764219790c83ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 10 15:00:04 2021 +0100 jscript: Improve prop_get and prop_put debug traces. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 5829cebe55b..efe8741f3c1 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -502,7 +502,7 @@ static HRESULT prop_get(jsdisp_t *This, dispex_prop_t *prop, jsval_t *r) return hres; } - TRACE("%s ret %s\n", debugstr_w(prop->name), debugstr_jsval(*r)); + TRACE("%p.%s ret %s\n", This, debugstr_w(prop->name), debugstr_jsval(*r)); return hres; } @@ -559,7 +559,7 @@ static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val) return E_FAIL; } - TRACE("%s = %s\n", debugstr_w(prop->name), debugstr_jsval(val)); + TRACE("%p.%s = %s\n", This, debugstr_w(prop->name), debugstr_jsval(val)); hres = jsval_copy(val, &prop->u.val); if(FAILED(hres))

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2021