August 2023 - Wine-commits - list.winehq.org

Hans Leidekker : ldap: Use SECPKG_ATTR_SESSION_KEY to retrieve the key size.
by Alexandre Julliard 03 Aug '23

03 Aug '23

Module: wine Branch: master Commit: 51571ba577a6cc210abf79f7c9bd2f1cebae5fa7 URL: https://gitlab.winehq.org/wine/wine/-/commit/51571ba577a6cc210abf79f7c9bd2f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 2 16:56:51 2023 +0200 ldap: Use SECPKG_ATTR_SESSION_KEY to retrieve the key size. --- libs/ldap/libldap/sasl_w.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/libs/ldap/libldap/sasl_w.c b/libs/ldap/libldap/sasl_w.c index f257e4db9e3..0e45558461a 100644 --- a/libs/ldap/libldap/sasl_w.c +++ b/libs/ldap/libldap/sasl_w.c @@ -220,6 +220,14 @@ static int fill_auth_identity( const sasl_interact_t *prompts, SEC_WINNT_AUTH_ID return SASL_OK; } +static ULONG get_key_size( CtxtHandle *ctx ) +{ + SecPkgContext_SessionKey key; + if (QueryContextAttributesA( ctx, SECPKG_ATTR_SESSION_KEY, &key )) return 0; + FreeContextBuffer( key.SessionKey ); + return key.SessionKeyLength * 8; +} + int sasl_client_start( sasl_conn_t *handle, const char *mechlist, sasl_interact_t **prompts, const char **clientout, unsigned int *clientoutlen, const char **mech ) { @@ -287,14 +295,9 @@ int sasl_client_step( sasl_conn_t *handle, const char *serverin, unsigned int se if (status == SEC_I_CONTINUE_NEEDED) return SASL_CONTINUE; else { - SecPkgContext_KeyInfoA key; SecPkgContext_Sizes sizes; - status = QueryContextAttributesA( &conn->ctxt_handle, SECPKG_ATTR_KEY_INFO, &key ); - if (status != SEC_E_OK) return SASL_FAIL; - FreeContextBuffer( key.sSignatureAlgorithmName ); - FreeContextBuffer( key.sEncryptAlgorithmName ); - conn->ssf = key.KeySize; + conn->ssf = get_key_size( &conn->ctxt_handle ); status = QueryContextAttributesA( &conn->ctxt_handle, SECPKG_ATTR_SIZES, &sizes ); if (status != SEC_E_OK) return SASL_FAIL;

1 0

Hans Leidekker : ldap: Set SSF when sasl_client_start() succeeds.
by Alexandre Julliard 03 Aug '23

03 Aug '23

Module: wine Branch: master Commit: 07d5bd7a33c2323d42d055a7461bfb04342e7173 URL: https://gitlab.winehq.org/wine/wine/-/commit/07d5bd7a33c2323d42d055a7461bfb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 2 17:00:11 2023 +0200 ldap: Set SSF when sasl_client_start() succeeds. This can happen when credentials are cached. --- libs/ldap/libldap/sasl_w.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libs/ldap/libldap/sasl_w.c b/libs/ldap/libldap/sasl_w.c index 0e45558461a..4f0b809ab63 100644 --- a/libs/ldap/libldap/sasl_w.c +++ b/libs/ldap/libldap/sasl_w.c @@ -261,7 +261,12 @@ int sasl_client_start( sasl_conn_t *handle, const char *mechlist, sasl_interact_ *clientout = out_bufs[0].pvBuffer; *clientoutlen = out_bufs[0].cbBuffer; *mech = "GSS-SPNEGO"; - return (status == SEC_I_CONTINUE_NEEDED) ? SASL_CONTINUE : SASL_OK; + if (status == SEC_I_CONTINUE_NEEDED) return SASL_CONTINUE; + else + { + conn->ssf = get_key_size( &conn->ctxt_handle ); + return SASL_OK; + } } return SASL_FAIL;

1 0

Hans Leidekker : ldap: Set trailer size when sasl_client_start() succeeds.
by Alexandre Julliard 03 Aug '23

03 Aug '23

Module: wine Branch: master Commit: b26ec54e6fb856fd73a3954bb99622727873c98d URL: https://gitlab.winehq.org/wine/wine/-/commit/b26ec54e6fb856fd73a3954bb99622… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 2 17:05:27 2023 +0200 ldap: Set trailer size when sasl_client_start() succeeds. --- libs/ldap/libldap/sasl_w.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/libs/ldap/libldap/sasl_w.c b/libs/ldap/libldap/sasl_w.c index 4f0b809ab63..83e78adb2a5 100644 --- a/libs/ldap/libldap/sasl_w.c +++ b/libs/ldap/libldap/sasl_w.c @@ -228,6 +228,13 @@ static ULONG get_key_size( CtxtHandle *ctx ) return key.SessionKeyLength * 8; } +static ULONG get_trailer_size( CtxtHandle *ctx ) +{ + SecPkgContext_Sizes sizes; + if (QueryContextAttributesA( ctx, SECPKG_ATTR_SIZES, &sizes )) return 0; + return sizes.cbSecurityTrailer; +} + int sasl_client_start( sasl_conn_t *handle, const char *mechlist, sasl_interact_t **prompts, const char **clientout, unsigned int *clientoutlen, const char **mech ) { @@ -265,6 +272,7 @@ int sasl_client_start( sasl_conn_t *handle, const char *mechlist, sasl_interact_ else { conn->ssf = get_key_size( &conn->ctxt_handle ); + conn->trailer_size = get_trailer_size( &conn->ctxt_handle ); return SASL_OK; } } @@ -300,13 +308,8 @@ int sasl_client_step( sasl_conn_t *handle, const char *serverin, unsigned int se if (status == SEC_I_CONTINUE_NEEDED) return SASL_CONTINUE; else { - SecPkgContext_Sizes sizes; - conn->ssf = get_key_size( &conn->ctxt_handle ); - - status = QueryContextAttributesA( &conn->ctxt_handle, SECPKG_ATTR_SIZES, &sizes ); - if (status != SEC_E_OK) return SASL_FAIL; - conn->trailer_size = sizes.cbSecurityTrailer; + conn->trailer_size = get_trailer_size( &conn->ctxt_handle ); return SASL_OK; } }

1 0

Dmitry Timoshkov : secur32: Convert "Negotiate" to an LSA package.
by Alexandre Julliard 03 Aug '23

03 Aug '23

Module: wine Branch: master Commit: 021547cabcb811c38060a2f7e675c25d26f16d3d URL: https://gitlab.winehq.org/wine/wine/-/commit/021547cabcb811c38060a2f7e675c2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 31 17:25:50 2023 +0300 secur32: Convert "Negotiate" to an LSA package. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 98 +++++-- dlls/secur32/negotiate.c | 700 ++++++++++++++++++-------------------------- dlls/secur32/secur32.c | 4 - dlls/secur32/secur32_priv.h | 6 +- 4 files changed, 353 insertions(+), 455 deletions(-)

1 0

Dmitry Timoshkov : secur32: Add a better stub for LsaApCallPackageUntrusted(NegGetCallerName).
by Alexandre Julliard 03 Aug '23

03 Aug '23

Module: wine Branch: master Commit: 519f5cc20a5f849138c6c6a80cd5c3773c11d012 URL: https://gitlab.winehq.org/wine/wine/-/commit/519f5cc20a5f849138c6c6a80cd5c3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Aug 1 13:31:05 2023 +0300 secur32: Add a better stub for LsaApCallPackageUntrusted(NegGetCallerName). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 6 +++++- dlls/secur32/negotiate.c | 16 +++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index fca290f4ae9..56d365edc7c 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -98,6 +98,10 @@ NTSTATUS WINAPI LsaCallAuthenticationPackage(HANDLE lsa_handle, ULONG package_id TRACE("%p,%lu,%p,%lu,%p,%p,%p\n", lsa_handle, package_id, in_buffer, in_buffer_length, out_buffer, out_buffer_length, status); + if (out_buffer) *out_buffer = NULL; + if (out_buffer_length) *out_buffer_length = 0; + if (status) *status = STATUS_SUCCESS; + for (i = 0; i < loaded_packages_count; i++) { if (loaded_packages[i].package_id == package_id) @@ -110,7 +114,7 @@ NTSTATUS WINAPI LsaCallAuthenticationPackage(HANDLE lsa_handle, ULONG package_id } } - return STATUS_INVALID_PARAMETER; + return STATUS_NO_SUCH_PACKAGE; } static struct lsa_handle *alloc_lsa_handle(ULONG magic) diff --git a/dlls/secur32/negotiate.c b/dlls/secur32/negotiate.c index c5d89a38228..323d14e9eaa 100644 --- a/dlls/secur32/negotiate.c +++ b/dlls/secur32/negotiate.c @@ -71,9 +71,23 @@ static WCHAR negotiate_comment_W[] = static NTSTATUS NTAPI nego_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 ) { + ULONG *MessageType; + FIXME("%p, %p, %p, %lu, %p, %p, %p: stub\n", req, in_buf, client_buf_base, in_buf_len, out_buf, out_buf_len, ret_status); - return SEC_E_UNSUPPORTED_FUNCTION; + if (!in_buf || in_buf_len < sizeof(*MessageType) || !out_buf || !out_buf_len || !ret_status) + return STATUS_INVALID_PARAMETER; + + MessageType = in_buf; + switch (*MessageType) + { + case 1: /* NegGetCallerName */ + *ret_status = STATUS_NO_SUCH_LOGON_SESSION; + return STATUS_SUCCESS; + + default: + return SEC_E_UNSUPPORTED_FUNCTION; + } } static NTSTATUS NTAPI nego_LsaApInitializePackage( ULONG package_id, PLSA_DISPATCH_TABLE dispatch,

1 0

Dmitry Timoshkov : secur32/tests: Add some tests for "Negotiate" LSA package.
by Alexandre Julliard 03 Aug '23

03 Aug '23

Module: wine Branch: master Commit: 835d73379fd885ceb3b0112ec53104cf639b2f38 URL: https://gitlab.winehq.org/wine/wine/-/commit/835d73379fd885ceb3b0112ec53104… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Aug 1 13:45:25 2023 +0300 secur32/tests: Add some tests for "Negotiate" LSA package. Fixed test failures under some Windows versions. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/tests/negotiate.c | 78 ++++++++++++++++++++++++++++++++++++++++++ include/ntsecapi.h | 21 ++++++++++++ 2 files changed, 99 insertions(+) diff --git a/dlls/secur32/tests/negotiate.c b/dlls/secur32/tests/negotiate.c index 22a0e7793df..dc470a332c7 100644 --- a/dlls/secur32/tests/negotiate.c +++ b/dlls/secur32/tests/negotiate.c @@ -21,6 +21,9 @@ #include <stdarg.h> #include <stdio.h> + +#include <ntstatus.h> +#define WIN32_NO_STATUS #include <windef.h> #include <winbase.h> #define SECURITY_WIN32 @@ -28,6 +31,9 @@ #include <rpc.h> #include <rpcdce.h> #include <secext.h> +#include <security.h> +#include <ntsecapi.h> +#include <winternl.h> #include "wine/test.h" @@ -346,6 +352,77 @@ done: } } +static void test_Negotiate(void) +{ + HANDLE lsa; + NTSTATUS status, call_status; + LSA_STRING name; + ULONG size, id; + NEGOTIATE_CALLER_NAME_REQUEST req; + NEGOTIATE_CALLER_NAME_RESPONSE *resp; + + status = LsaConnectUntrusted(&lsa); + ok(!status, "got %08lx\n", status); + + RtlInitAnsiString(&name, "Negotiate"); + id = 0xdeadbeef; + status = LsaLookupAuthenticationPackage(lsa, &name, &id); + ok(!status, "got %08lx\n", status); + ok(id == 0, "got %lu\n", id); + + req.MessageType = NegGetCallerName; + req.LogonId.LowPart = 0; + req.LogonId.HighPart = 0; + resp = (void *)(ULONG_PTR)0xdeadbeef; + size = 0xdeadbeef; + call_status = 0xdeadbeef; + status = LsaCallAuthenticationPackage(lsa, 0, &req, sizeof(req), (void **)&resp, &size, &call_status); + ok(status == STATUS_SUCCESS, "got %08lx\n", status); + ok(call_status == STATUS_NO_SUCH_LOGON_SESSION || call_status == STATUS_SUCCESS, "got %08lx\n", call_status); + if (call_status == STATUS_NO_SUCH_LOGON_SESSION) + { + ok(size == 0, "got %lu\n", size); + ok(resp == NULL, "got %p\n", resp); + } + else /* STATUS_SUCCESS */ + { + if (resp && resp->CallerName) + trace("resp->CallerName = %s\n", debugstr_w(resp->CallerName)); + ok(resp != NULL, "got NULL\n"); + ok(resp->MessageType == NegGetCallerName, "got %lu\n", resp->MessageType); + ok((char *)resp->CallerName >= (char *)(resp + 1), "got %p/%p\n", resp, resp->CallerName); + ok(size >= sizeof(*resp) + (wcslen(resp->CallerName) + 1) * sizeof(WCHAR), "got %lu\n", size); + } + + size = 0xdeadbeef; + call_status = 0xdeadbeef; + status = LsaCallAuthenticationPackage(lsa, 0, NULL, 0, NULL, &size, &call_status); + ok(status == STATUS_INVALID_PARAMETER, "got %08lx\n", status); + ok(call_status == STATUS_SUCCESS, "got %08lx\n", call_status); + ok(size == 0, "got %08lx\n", size); + + size = 0xdeadbeef; + status = LsaCallAuthenticationPackage(lsa, 0, NULL, 0, NULL, &size, NULL); + ok(status == STATUS_INVALID_PARAMETER, "got %08lx\n", status); + ok(size == 0, "got %08lx\n", size); + + call_status = 0xdeadbeef; + status = LsaCallAuthenticationPackage(lsa, 0, NULL, 0, NULL, NULL, &call_status); + ok(status == STATUS_INVALID_PARAMETER, "got %08lx\n", status); + ok(call_status == STATUS_SUCCESS, "got %08lx\n", call_status); + + resp = (void *)(ULONG_PTR)0xdeadbeef; + size = 0xdeadbeef; + call_status = 0xdeadbeef; + status = LsaCallAuthenticationPackage(lsa, 0xdeadbeef, NULL, 0, (void **)&resp, &size, &call_status); + ok(status == STATUS_NO_SUCH_PACKAGE, "got %08lx\n", status); + ok(call_status == STATUS_SUCCESS, "got %08lx\n", call_status); + ok(size == 0, "got %08lx\n", size); + ok(resp == NULL, "got %p\n", resp); + + LsaDeregisterLogonProcess(lsa); +} + START_TEST(negotiate) { SecPkgInfoA *info; @@ -367,4 +444,5 @@ START_TEST(negotiate) FreeContextBuffer( info ); test_authentication(); + test_Negotiate(); } diff --git a/include/ntsecapi.h b/include/ntsecapi.h index 992aebf66d2..ded31b41e56 100644 --- a/include/ntsecapi.h +++ b/include/ntsecapi.h @@ -356,6 +356,27 @@ typedef struct _AUDIT_POLICY_INFORMATION GUID AuditCategoryGuid; } AUDIT_POLICY_INFORMATION, *PAUDIT_POLICY_INFORMATION; +enum NEGOTIATE_MESSAGES +{ + NegEnumPackagePrefixes, + NegGetCallerName, + NegTransferCredentials, + NegMsgReserved1, + NegCallPackageMax +}; + +typedef struct _NEGOTIATE_CALLER_NAME_REQUEST +{ + ULONG MessageType; + LUID LogonId; +} NEGOTIATE_CALLER_NAME_REQUEST, *PNEGOTIATE_CALLER_NAME_REQUEST; + +typedef struct _NEGOTIATE_CALLER_NAME_RESPONSE +{ + ULONG MessageType; + PWSTR CallerName; +} NEGOTIATE_CALLER_NAME_RESPONSE, *PNEGOTIATE_CALLER_NAME_RESPONSE; + #define MICROSOFT_KERBEROS_NAME_A "Kerberos" #if defined(_MSC_VER) || defined(__MINGW32__) #define MICROSOFT_KERBEROS_NAME_W L"Kerberos"

1 0

Hans Leidekker : secur32: Implement lsa_QueryContextAttributesA(SECPKG_ATTR_SESSION_KEY).
by Alexandre Julliard 03 Aug '23

03 Aug '23

Module: wine Branch: master Commit: 922372e64c311ab611c1e0d23f5bf5e2b675e457 URL: https://gitlab.winehq.org/wine/wine/-/commit/922372e64c311ab611c1e0d23f5bf5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 1 14:08:43 2023 +0200 secur32: Implement lsa_QueryContextAttributesA(SECPKG_ATTR_SESSION_KEY). --- dlls/secur32/lsa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 56d365edc7c..a9ca8b60283 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -685,6 +685,7 @@ static SECURITY_STATUS WINAPI lsa_QueryContextAttributesA(CtxtHandle *context, U switch (attribute) { case SECPKG_ATTR_SIZES: + case SECPKG_ATTR_SESSION_KEY: return lsa_QueryContextAttributesW( context, attribute, buffer ); case SECPKG_ATTR_NEGOTIATION_INFO: @@ -721,7 +722,6 @@ static SECURITY_STATUS WINAPI lsa_QueryContextAttributesA(CtxtHandle *context, U X(SECPKG_ATTR_NATIVE_NAMES); X(SECPKG_ATTR_PACKAGE_INFO); X(SECPKG_ATTR_PASSWORD_EXPIRY); - X(SECPKG_ATTR_SESSION_KEY); X(SECPKG_ATTR_STREAM_SIZES); X(SECPKG_ATTR_TARGET_INFORMATION); #undef X

1 0

Hans Leidekker : msv1_0: Implement SECPKG_ATTR_SESSION_KEY.
by Alexandre Julliard 03 Aug '23

03 Aug '23

Module: wine Branch: master Commit: da750b77bdb8125b6cf6cd84c9bc440baf5ec135 URL: https://gitlab.winehq.org/wine/wine/-/commit/da750b77bdb8125b6cf6cd84c9bc44… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 1 15:01:53 2023 +0200 msv1_0: Implement SECPKG_ATTR_SESSION_KEY. --- dlls/msv1_0/main.c | 14 +++++++++++++- dlls/secur32/tests/ntlm.c | 10 ++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/msv1_0/main.c b/dlls/msv1_0/main.c index a877d974486..53d8f1b6415 100644 --- a/dlls/msv1_0/main.c +++ b/dlls/msv1_0/main.c @@ -1138,7 +1138,6 @@ static NTSTATUS NTAPI ntlm_SpQueryContextAttributes( LSA_SEC_HANDLE handle, ULON X(SECPKG_ATTR_NATIVE_NAMES); X(SECPKG_ATTR_PACKAGE_INFO); X(SECPKG_ATTR_PASSWORD_EXPIRY); - X(SECPKG_ATTR_SESSION_KEY); X(SECPKG_ATTR_STREAM_SIZES); X(SECPKG_ATTR_TARGET_INFORMATION); case SECPKG_ATTR_FLAGS: @@ -1167,6 +1166,19 @@ static NTSTATUS NTAPI ntlm_SpQueryContextAttributes( LSA_SEC_HANDLE handle, ULON info->NegotiationState = SECPKG_NEGOTIATION_COMPLETE; return SEC_E_OK; } + case SECPKG_ATTR_SESSION_KEY: + { + struct ntlm_ctx *ctx = (struct ntlm_ctx *)handle; + SecPkgContext_SessionKey *key = (SecPkgContext_SessionKey *)buf; + unsigned char *session_key; + + if (!(session_key = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(ctx->session_key) ))) + return SEC_E_INSUFFICIENT_MEMORY; + memcpy( session_key, ctx->session_key, sizeof(ctx->session_key) ); + key->SessionKey = session_key; + key->SessionKeyLength = sizeof(ctx->session_key); + return SEC_E_OK; + } case SECPKG_ATTR_KEY_INFO: { struct ntlm_ctx *ctx = (struct ntlm_ctx *)handle; diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index 4accf4b2d79..42d9b580d71 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -824,6 +824,7 @@ static void testAuth(ULONG data_rep, BOOL fake) SecPkgContext_StreamSizes stream_sizes; SecPkgContext_NegotiationInfoA info; SecPkgContext_KeyInfoA key; + SecPkgContext_SessionKey session_key; SecPkgInfoA *pi; if(pQuerySecurityPackageInfoA( sec_pkg_name, &pkg_info)!= SEC_E_OK) @@ -927,6 +928,15 @@ static void testAuth(ULONG data_rep, BOOL fake) } ok( key.KeySize == 128, "got %lu\n", key.KeySize ); ok( key.EncryptAlgorithm == CALG_RC4, "got %#lx\n", key.EncryptAlgorithm ); + FreeContextBuffer( key.sSignatureAlgorithmName ); + FreeContextBuffer( key.sEncryptAlgorithmName ); + + memset( &session_key, 0, sizeof(session_key) ); + sec_status = QueryContextAttributesA( &client.ctxt, SECPKG_ATTR_SESSION_KEY, &session_key ); + ok( sec_status == SEC_E_OK, "pQueryContextAttributesA returned %08lx\n", sec_status ); + ok( session_key.SessionKeyLength, "got 0 key length\n" ); + ok( session_key.SessionKey != NULL, "got NULL session key\n" ); + FreeContextBuffer( session_key.SessionKey ); memset(&info, 0, sizeof(info)); sec_status = QueryContextAttributesA(&client.ctxt, SECPKG_ATTR_NEGOTIATION_INFO, &info);

1 0

Hans Leidekker : kerberos: Implement SECPKG_ATTR_SESSION_KEY.
by Alexandre Julliard 03 Aug '23

03 Aug '23

Module: wine Branch: master Commit: 26c19ea6816022e323a509444db057fecbe5ad82 URL: https://gitlab.winehq.org/wine/wine/-/commit/26c19ea6816022e323a509444db057… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 2 16:45:44 2023 +0200 kerberos: Implement SECPKG_ATTR_SESSION_KEY. --- dlls/kerberos/krb5_ap.c | 20 ++++++++++++-- dlls/kerberos/unixlib.c | 72 ++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 75 insertions(+), 17 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 2f46b7f246f..0cd44b9ca96 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -633,9 +633,26 @@ static NTSTATUS NTAPI kerberos_SpQueryContextAttributes( LSA_SEC_HANDLE context, X(SECPKG_ATTR_NATIVE_NAMES); X(SECPKG_ATTR_PACKAGE_INFO); X(SECPKG_ATTR_PASSWORD_EXPIRY); - X(SECPKG_ATTR_SESSION_KEY); X(SECPKG_ATTR_STREAM_SIZES); X(SECPKG_ATTR_TARGET_INFORMATION); +#undef X + case SECPKG_ATTR_SESSION_KEY: + { + SecPkgContext_SessionKey key = { 128 }; + struct query_context_attributes_params params = { context_handle->handle, attribute, &key }; + NTSTATUS status; + + if (!(key.SessionKey = RtlAllocateHeap( GetProcessHeap(), 0, key.SessionKeyLength ))) return STATUS_NO_MEMORY; + + if ((status = KRB5_CALL( query_context_attributes, &params ))) + { + RtlFreeHeap( GetProcessHeap(), 0, key.SessionKey ); + return status; + } + + *(SecPkgContext_SessionKey *)buffer = key; + return SEC_E_OK; + } case SECPKG_ATTR_SIZES: { struct query_context_attributes_params params = { context_handle->handle, attribute, buffer }; @@ -648,7 +665,6 @@ static NTSTATUS NTAPI kerberos_SpQueryContextAttributes( LSA_SEC_HANDLE context, info->NegotiationState = SECPKG_NEGOTIATION_COMPLETE; return SEC_E_OK; } -#undef X default: FIXME( "unknown attribute %lu\n", attribute ); break; diff --git a/dlls/kerberos/unixlib.c b/dlls/kerberos/unixlib.c index 121809e231b..c81c8a220ea 100644 --- a/dlls/kerberos/unixlib.c +++ b/dlls/kerberos/unixlib.c @@ -403,7 +403,9 @@ MAKE_FUNCPTR( gss_get_mic ); MAKE_FUNCPTR( gss_import_name ); MAKE_FUNCPTR( gss_init_sec_context ); MAKE_FUNCPTR( gss_inquire_context ); +MAKE_FUNCPTR( gss_inquire_sec_context_by_oid ); MAKE_FUNCPTR( gss_release_buffer ); +MAKE_FUNCPTR( gss_release_buffer_set ); MAKE_FUNCPTR( gss_release_cred ); MAKE_FUNCPTR( gss_release_iov_buffer ); MAKE_FUNCPTR( gss_release_name ); @@ -429,21 +431,23 @@ static BOOL load_gssapi_krb5(void) 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_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_inquire_sec_context_by_oid ) + LOAD_FUNCPTR( gss_release_buffer ) + LOAD_FUNCPTR( gss_release_buffer_set ) + 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 @@ -804,11 +808,49 @@ static NTSTATUS make_signature( void *args ) #define KERBEROS_MAX_SIGNATURE_DCE 28 #define KERBEROS_SECURITY_TRAILER_DCE 76 +static NTSTATUS get_session_key( gss_ctx_id_t ctx, SecPkgContext_SessionKey *key ) +{ + gss_OID_desc GSS_C_INQ_SSPI_SESSION_KEY = + { 11, (void *)"\x2a\x86\x48\x86\xf7\x12\x01\x02\x02\x05\x05" }; /* 1.2.840.113554.1.2.2.5.5 */ + OM_uint32 ret, minor_status; + gss_buffer_set_t buffer_set = GSS_C_NO_BUFFER_SET; + + ret = pgss_inquire_sec_context_by_oid( &minor_status, ctx, &GSS_C_INQ_SSPI_SESSION_KEY, &buffer_set ); + if (GSS_ERROR( ret )) trace_gss_status( ret, minor_status ); + if (ret != GSS_S_COMPLETE) return STATUS_INTERNAL_ERROR; + + if (buffer_set == GSS_C_NO_BUFFER_SET || buffer_set->count != 2) + { + pgss_release_buffer_set( &minor_status, &buffer_set ); + return STATUS_INTERNAL_ERROR; + } + + if (key->SessionKeyLength < buffer_set->elements[0].length ) + { + key->SessionKeyLength = buffer_set->elements[0].length; + pgss_release_buffer_set( &minor_status, &buffer_set ); + return STATUS_BUFFER_TOO_SMALL; + } + + memcpy( key->SessionKey, buffer_set->elements[0].value, buffer_set->elements[0].length ); + key->SessionKeyLength = buffer_set->elements[0].length; + + pgss_release_buffer_set( &minor_status, &buffer_set ); + return STATUS_SUCCESS; +} + static NTSTATUS query_context_attributes( void *args ) { struct query_context_attributes_params *params = args; switch (params->attr) { + case SECPKG_ATTR_SESSION_KEY: + { + SecPkgContext_SessionKey *key = (SecPkgContext_SessionKey *)params->buf; + gss_ctx_id_t ctx = ctxhandle_sspi_to_gss( params->context ); + + return get_session_key( ctx, key ); + } case SECPKG_ATTR_SIZES: { SecPkgContext_Sizes *sizes = (SecPkgContext_Sizes *)params->buf;

1 0

Zebediah Figura : qcap/tests: Add more tests for audio record media types.
by Alexandre Julliard 03 Aug '23

03 Aug '23

Module: wine Branch: master Commit: b0f7f843277cc33c68f015f9e4fa51fd6524b2f8 URL: https://gitlab.winehq.org/wine/wine/-/commit/b0f7f843277cc33c68f015f9e4fa51… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 25 18:45:21 2023 -0500 qcap/tests: Add more tests for audio record media types. --- dlls/qcap/tests/audiorecord.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/qcap/tests/audiorecord.c b/dlls/qcap/tests/audiorecord.c index e0a130fefb3..ddf54e68e21 100644 --- a/dlls/qcap/tests/audiorecord.c +++ b/dlls/qcap/tests/audiorecord.c @@ -1118,6 +1118,19 @@ static void test_stream_config(IBaseFilter *filter) ok(compare_media_types(mt, mt2), "Media types didn't match.\n"); DeleteMediaType(mt2); + /* The first entry in the list is always the same as the format set. */ + IPin_EnumMediaTypes(source, &enummt); + hr = IEnumMediaTypes_Next(enummt, 1, &mt2, NULL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + todo_wine_if (i > 0) ok(compare_media_types(mt, mt2), "Media types didn't match.\n"); + DeleteMediaType(mt2); + IEnumMediaTypes_Release(enummt); + + hr = IAMStreamConfig_GetStreamCaps(config, 0, &mt2, (BYTE *)&caps); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + todo_wine_if (i > 0) ok(compare_media_types(mt, mt2), "Media types didn't match.\n"); + DeleteMediaType(mt2); + DeleteMediaType(mt); winetest_pop_context(); @@ -1135,6 +1148,9 @@ static void test_stream_config(IBaseFilter *filter) ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(compare_media_types(mt, mt2), "Media types didn't match.\n"); + hr = IPin_QueryAccept(source, mt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + DeleteMediaType(mt2); DeleteMediaType(mt); }

1 0