wine-commits January 2018

wine-commits@winehq.org

2 participants
638 discussions

Hans Leidekker : kerberos: Implement SpFreeCredentialsHandle.
by Alexandre Julliard 24 Jan '18

24 Jan '18

Module: wine Branch: master Commit: 5aaeaa60c2a598a4378437b13b447579fc02f8b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5aaeaa60c2a598a4378437b1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 18 23:51:39 2018 +0800 kerberos: Implement SpFreeCredentialsHandle. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 4aadd77..b467119 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -192,6 +192,7 @@ MAKE_FUNCPTR(gss_delete_sec_context); 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_name); #undef MAKE_FUNCPTR @@ -216,6 +217,7 @@ static BOOL load_gssapi_krb5(void) LOAD_FUNCPTR(gss_import_name) LOAD_FUNCPTR(gss_init_sec_context) LOAD_FUNCPTR(gss_release_buffer) + LOAD_FUNCPTR(gss_release_cred) LOAD_FUNCPTR(gss_release_name) #undef LOAD_FUNCPTR @@ -419,6 +421,27 @@ static NTSTATUS NTAPI kerberos_SpAcquireCredentialsHandle( #endif } +static NTSTATUS NTAPI kerberos_SpFreeCredentialsHandle( LSA_SEC_HANDLE credential ) +{ +#ifdef SONAME_LIBGSSAPI_KRB5 + OM_uint32 ret, minor_status; + gss_cred_id_t cred_handle; + + TRACE( "(%lx)\n", credential ); + + if (!credential) return SEC_E_INVALID_HANDLE; + if (!(cred_handle = credhandle_sspi_to_gss( credential ))) return SEC_E_OK; + + ret = pgss_release_cred( &minor_status, &cred_handle ); + TRACE( "gss_release_cred returned %08x minor status %08x\n", ret, minor_status ); + + return status_gss_to_sspi( ret ); +#else + FIXME( "(%lx)\n", credential ); + return SEC_E_UNSUPPORTED_FUNCTION; +#endif +} + static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, LSA_SEC_HANDLE context, UNICODE_STRING *target_name, ULONG context_req, ULONG target_data_rep, SecBufferDesc *input, LSA_SEC_HANDLE *new_context, SecBufferDesc *output, ULONG *context_attr, TimeStamp *ts_expiry, @@ -624,7 +647,7 @@ static SECPKG_FUNCTION_TABLE kerberos_table = NULL, /* AcceptCredentials */ kerberos_SpAcquireCredentialsHandle, NULL, /* SpQueryCredentialsAttributes */ - NULL, /* FreeCredentialsHandle */ + kerberos_SpFreeCredentialsHandle, NULL, /* SaveCredentials */ NULL, /* GetCredentials */ NULL, /* DeleteCredentials */

1 0

Hans Leidekker : kerberos: Implement SpDeleteContext.
by Alexandre Julliard 24 Jan '18

24 Jan '18

Module: wine Branch: master Commit: 09f040432649eb12741bb9736ef150afd2c1a92e URL: https://source.winehq.org/git/wine.git/?a=commit;h=09f040432649eb12741bb973… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 18 23:51:35 2018 +0800 kerberos: Implement SpDeleteContext. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 7f0006d..4aadd77 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -565,6 +565,26 @@ static NTSTATUS NTAPI kerberos_SpAcceptLsaModeContext( LSA_SEC_HANDLE credential #endif } +static NTSTATUS NTAPI kerberos_SpDeleteContext( LSA_SEC_HANDLE context ) +{ +#ifdef SONAME_LIBGSSAPI_KRB5 + OM_uint32 ret, minor_status; + gss_ctx_id_t ctxt_handle; + + TRACE( "(%lx)\n", context ); + if (!context) return SEC_E_INVALID_HANDLE; + if (!(ctxt_handle = ctxthandle_sspi_to_gss( context ))) return SEC_E_OK; + + ret = pgss_delete_sec_context( &minor_status, &ctxt_handle, GSS_C_NO_BUFFER ); + TRACE( "gss_delete_sec_context returned %08x minor status %08x\n", ret, minor_status ); + + return status_gss_to_sspi( ret ); +#else + FIXME( "(%lx)\n", context ); + return SEC_E_UNSUPPORTED_FUNCTION; +#endif +} + static NTSTATUS NTAPI kerberos_SpInitialize(ULONG_PTR package_id, SECPKG_PARAMETERS *params, LSA_SECPKG_FUNCTION_TABLE *lsa_function_table) { @@ -610,7 +630,7 @@ static SECPKG_FUNCTION_TABLE kerberos_table = NULL, /* DeleteCredentials */ kerberos_SpInitLsaModeContext, kerberos_SpAcceptLsaModeContext, - NULL, /* DeleteContext */ + kerberos_SpDeleteContext, NULL, /* ApplyControlToken */ NULL, /* GetUserInfo */ NULL, /* GetExtendedInformation */

1 0

Hans Leidekker : kerberos: Implement SpAcceptLsaModeContext.
by Alexandre Julliard 24 Jan '18

24 Jan '18

Module: wine Branch: master Commit: ce3f72ef32186b8e212c1ca14b6aed9d79f074b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce3f72ef32186b8e212c1ca1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 18 23:51:31 2018 +0800 kerberos: Implement SpAcceptLsaModeContext. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 83 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 0821e7c..7f0006d 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -186,6 +186,7 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); static void *libgssapi_krb5_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f +MAKE_FUNCPTR(gss_accept_sec_context); MAKE_FUNCPTR(gss_acquire_cred); MAKE_FUNCPTR(gss_delete_sec_context); MAKE_FUNCPTR(gss_import_name); @@ -209,6 +210,7 @@ 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_import_name) @@ -336,6 +338,19 @@ static ULONG flags_gss_to_isc_ret( ULONG flags ) return ret; } +static ULONG flags_gss_to_asc_ret( ULONG flags ) +{ + ULONG ret = 0; + if (flags & GSS_C_DELEG_FLAG) ret |= ASC_RET_DELEGATE; + if (flags & GSS_C_MUTUAL_FLAG) ret |= ASC_RET_MUTUAL_AUTH; + if (flags & GSS_C_REPLAY_FLAG) ret |= ASC_RET_REPLAY_DETECT; + if (flags & GSS_C_SEQUENCE_FLAG) ret |= ASC_RET_SEQUENCE_DETECT; + if (flags & GSS_C_CONF_FLAG) ret |= ASC_RET_CONFIDENTIALITY; + if (flags & GSS_C_INTEG_FLAG) ret |= ASC_RET_INTEGRITY; + if (flags & GSS_C_ANON_FLAG) ret |= ASC_RET_NULL_SESSION; + return ret; +} + static int get_buffer_index( SecBufferDesc *desc, DWORD type ) { UINT i; @@ -483,6 +498,73 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, #endif } +static NTSTATUS NTAPI kerberos_SpAcceptLsaModeContext( LSA_SEC_HANDLE credential, LSA_SEC_HANDLE context, + SecBufferDesc *input, ULONG context_req, ULONG target_data_rep, LSA_SEC_HANDLE *new_context, + SecBufferDesc *output, ULONG *context_attr, TimeStamp *ts_expiry, BOOLEAN *mapped_context, SecBuffer *context_data ) +{ +#ifdef SONAME_LIBGSSAPI_KRB5 + OM_uint32 ret, minor_status, ret_flags, expiry_time; + gss_cred_id_t cred_handle; + gss_ctx_id_t ctxt_handle; + gss_buffer_desc input_token, output_token; + gss_name_t target = GSS_C_NO_NAME; + int idx; + + TRACE( "(%lx %lx 0x%08x %u %p %p %p %p %p %p %p)\n", credential, context, context_req, + target_data_rep, input, new_context, output, context_attr, ts_expiry, + mapped_context, context_data ); + if (context_req) FIXME( "ignoring flags 0x%08x\n", context_req ); + + if (!context && !input && !credential) return SEC_E_INVALID_HANDLE; + cred_handle = credhandle_sspi_to_gss( credential ); + ctxt_handle = ctxthandle_sspi_to_gss( context ); + + if (!input) input_token.length = 0; + else + { + if ((idx = get_buffer_index( input, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + input_token.length = input->pBuffers[idx].cbBuffer; + input_token.value = input->pBuffers[idx].pvBuffer; + } + + if ((idx = get_buffer_index( output, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + output_token.length = 0; + output_token.value = NULL; + + ret = pgss_accept_sec_context( &minor_status, &ctxt_handle, cred_handle, &input_token, GSS_C_NO_CHANNEL_BINDINGS, + &target, NULL, &output_token, &ret_flags, &expiry_time, NULL ); + TRACE( "gss_accept_sec_context returned %08x minor status %08x ctxt_handle %p\n", ret, minor_status, ctxt_handle ); + if (ret == GSS_S_COMPLETE || ret == GSS_S_CONTINUE_NEEDED) + { + if (output_token.length > output->pBuffers[idx].cbBuffer) /* FIXME: check if larger buffer exists */ + { + TRACE( "buffer too small %lu > %u\n", (SIZE_T)output_token.length, output->pBuffers[idx].cbBuffer ); + pgss_release_buffer( &minor_status, &output_token ); + pgss_delete_sec_context( &minor_status, &ctxt_handle, GSS_C_NO_BUFFER ); + return SEC_E_BUFFER_TOO_SMALL; + } + output->pBuffers[idx].cbBuffer = output_token.length; + memcpy( output->pBuffers[idx].pvBuffer, output_token.value, output_token.length ); + pgss_release_buffer( &minor_status, &output_token ); + + ctxthandle_gss_to_sspi( ctxt_handle, new_context ); + if (context_attr) *context_attr = flags_gss_to_asc_ret( ret_flags ); + expirytime_gss_to_sspi( expiry_time, ts_expiry ); + } + + /* we do support user mode SSP/AP functions */ + *mapped_context = TRUE; + /* FIXME: initialize context_data */ + + return status_gss_to_sspi( ret ); +#else + FIXME( "(%lx %lx 0x%08x %u %p %p %p %p %p %p %p)\n", credential, context, context_req, + target_data_rep, input, new_context, output, context_attr, ts_expiry, + mapped_context, context_data ); + return SEC_E_UNSUPPORTED_FUNCTION; +#endif +} + static NTSTATUS NTAPI kerberos_SpInitialize(ULONG_PTR package_id, SECPKG_PARAMETERS *params, LSA_SECPKG_FUNCTION_TABLE *lsa_function_table) { @@ -527,7 +609,7 @@ static SECPKG_FUNCTION_TABLE kerberos_table = NULL, /* GetCredentials */ NULL, /* DeleteCredentials */ kerberos_SpInitLsaModeContext, - NULL, /* AcceptLsaModeContext */ + kerberos_SpAcceptLsaModeContext, NULL, /* DeleteContext */ NULL, /* ApplyControlToken */ NULL, /* GetUserInfo */

1 0

Hans Leidekker : kerberos: Implement SpInitLsaModeContext.
by Alexandre Julliard 24 Jan '18

24 Jan '18

Module: wine Branch: master Commit: 61086485e8afa79d5c459b6bd900372a401a7863 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61086485e8afa79d5c459b6b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 18 23:51:28 2018 +0800 kerberos: Implement SpInitLsaModeContext. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 141 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 140 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 06a0ad4..0821e7c 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -187,7 +187,10 @@ static void *libgssapi_krb5_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(gss_acquire_cred); +MAKE_FUNCPTR(gss_delete_sec_context); MAKE_FUNCPTR(gss_import_name); +MAKE_FUNCPTR(gss_init_sec_context); +MAKE_FUNCPTR(gss_release_buffer); MAKE_FUNCPTR(gss_release_name); #undef MAKE_FUNCPTR @@ -207,7 +210,10 @@ static BOOL load_gssapi_krb5(void) } LOAD_FUNCPTR(gss_acquire_cred) + LOAD_FUNCPTR(gss_delete_sec_context) LOAD_FUNCPTR(gss_import_name) + LOAD_FUNCPTR(gss_init_sec_context) + LOAD_FUNCPTR(gss_release_buffer) LOAD_FUNCPTR(gss_release_name) #undef LOAD_FUNCPTR @@ -225,11 +231,28 @@ static void unload_gssapi_krb5(void) libgssapi_krb5_handle = NULL; } +static inline gss_cred_id_t credhandle_sspi_to_gss( LSA_SEC_HANDLE cred ) +{ + if (!cred) return GSS_C_NO_CREDENTIAL; + return (gss_cred_id_t)cred; +} + static inline void credhandle_gss_to_sspi( gss_cred_id_t handle, LSA_SEC_HANDLE *cred ) { *cred = (LSA_SEC_HANDLE)handle; } +static inline gss_ctx_id_t ctxthandle_sspi_to_gss( LSA_SEC_HANDLE ctxt ) +{ + if (!ctxt) return GSS_C_NO_CONTEXT; + return (gss_ctx_id_t)ctxt; +} + +static inline void ctxthandle_gss_to_sspi( gss_ctx_id_t handle, LSA_SEC_HANDLE *ctxt ) +{ + *ctxt = (LSA_SEC_HANDLE)handle; +} + static SECURITY_STATUS status_gss_to_sspi( OM_uint32 status ) { switch (status) @@ -286,6 +309,43 @@ static SECURITY_STATUS name_sspi_to_gss( const UNICODE_STRING *name_str, gss_nam HeapFree( GetProcessHeap(), 0, buf.value ); return status_gss_to_sspi( ret ); } + +static ULONG flags_isc_req_to_gss( ULONG flags ) +{ + ULONG ret = GSS_C_DCE_STYLE; + if (flags & ISC_REQ_DELEGATE) ret |= GSS_C_DELEG_FLAG; + if (flags & ISC_REQ_MUTUAL_AUTH) ret |= GSS_C_MUTUAL_FLAG; + if (flags & ISC_REQ_REPLAY_DETECT) ret |= GSS_C_REPLAY_FLAG; + if (flags & ISC_REQ_SEQUENCE_DETECT) ret |= GSS_C_SEQUENCE_FLAG; + if (flags & ISC_REQ_CONFIDENTIALITY) ret |= GSS_C_CONF_FLAG; + if (flags & ISC_REQ_INTEGRITY) ret |= GSS_C_INTEG_FLAG; + if (flags & ISC_REQ_NULL_SESSION) ret |= GSS_C_ANON_FLAG; + return ret; +} + +static ULONG flags_gss_to_isc_ret( ULONG flags ) +{ + ULONG ret = 0; + if (flags & GSS_C_DELEG_FLAG) ret |= ISC_RET_DELEGATE; + if (flags & GSS_C_MUTUAL_FLAG) ret |= ISC_RET_MUTUAL_AUTH; + if (flags & GSS_C_REPLAY_FLAG) ret |= ISC_RET_REPLAY_DETECT; + if (flags & GSS_C_SEQUENCE_FLAG) ret |= ISC_RET_SEQUENCE_DETECT; + if (flags & GSS_C_CONF_FLAG) ret |= ISC_RET_CONFIDENTIALITY; + if (flags & GSS_C_INTEG_FLAG) ret |= ISC_RET_INTEGRITY; + if (flags & GSS_C_ANON_FLAG) ret |= ISC_RET_NULL_SESSION; + return ret; +} + +static int get_buffer_index( SecBufferDesc *desc, DWORD type ) +{ + UINT i; + if (!desc) return -1; + for (i = 0; i < desc->cBuffers; i++) + { + if (desc->pBuffers[i].BufferType == type) return i; + } + return -1; +} #endif /* SONAME_LIBGSSAPI_KRB5 */ static NTSTATUS NTAPI kerberos_SpAcquireCredentialsHandle( @@ -344,6 +404,85 @@ static NTSTATUS NTAPI kerberos_SpAcquireCredentialsHandle( #endif } +static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, LSA_SEC_HANDLE context, + UNICODE_STRING *target_name, ULONG context_req, ULONG target_data_rep, SecBufferDesc *input, + LSA_SEC_HANDLE *new_context, SecBufferDesc *output, ULONG *context_attr, TimeStamp *ts_expiry, + BOOLEAN *mapped_context, SecBuffer *context_data ) +{ +#ifdef SONAME_LIBGSSAPI_KRB5 + static const ULONG supported = ISC_REQ_CONFIDENTIALITY | ISC_REQ_INTEGRITY | ISC_REQ_SEQUENCE_DETECT | + ISC_REQ_REPLAY_DETECT | ISC_REQ_MUTUAL_AUTH; + OM_uint32 ret, minor_status, ret_flags, expiry_time, req_flags = flags_isc_req_to_gss( context_req ); + gss_cred_id_t cred_handle; + gss_ctx_id_t ctxt_handle; + gss_buffer_desc input_token, output_token; + gss_name_t target = GSS_C_NO_NAME; + int idx; + + TRACE( "(%lx %lx %s 0x%08x %u %p %p %p %p %p %p %p)\n", credential, context, debugstr_us(target_name), + 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 ); + ctxt_handle = ctxthandle_sspi_to_gss( context ); + + if (!input) input_token.length = 0; + else + { + if ((idx = get_buffer_index( input, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + input_token.length = input->pBuffers[idx].cbBuffer; + input_token.value = input->pBuffers[idx].pvBuffer; + } + + if ((idx = get_buffer_index( output, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + output_token.length = 0; + output_token.value = NULL; + + if (target_name && ((ret = name_sspi_to_gss( target_name, &target )) != SEC_E_OK)) return ret; + + ret = pgss_init_sec_context( &minor_status, cred_handle, &ctxt_handle, target, GSS_C_NO_OID, req_flags, 0, + GSS_C_NO_CHANNEL_BINDINGS, &input_token, NULL, &output_token, &ret_flags, + &expiry_time ); + TRACE( "gss_init_sec_context returned %08x minor status %08x ret_flags %08x\n", ret, minor_status, ret_flags ); + if (ret == GSS_S_COMPLETE || ret == GSS_S_CONTINUE_NEEDED) + { + if (output_token.length > output->pBuffers[idx].cbBuffer) /* FIXME: check if larger buffer exists */ + { + TRACE( "buffer too small %lu > %u\n", (SIZE_T)output_token.length, output->pBuffers[idx].cbBuffer ); + pgss_release_buffer( &minor_status, &output_token ); + pgss_delete_sec_context( &minor_status, &ctxt_handle, GSS_C_NO_BUFFER ); + return SEC_E_INCOMPLETE_MESSAGE; + } + output->pBuffers[idx].cbBuffer = output_token.length; + memcpy( output->pBuffers[idx].pvBuffer, output_token.value, output_token.length ); + pgss_release_buffer( &minor_status, &output_token ); + + ctxthandle_gss_to_sspi( ctxt_handle, new_context ); + if (context_attr) *context_attr = flags_gss_to_isc_ret( ret_flags ); + expirytime_gss_to_sspi( expiry_time, ts_expiry ); + } + + if (target != GSS_C_NO_NAME) pgss_release_name( &minor_status, &target ); + + /* we do support user mode SSP/AP functions */ + *mapped_context = TRUE; + /* FIXME: initialize context_data */ + + return status_gss_to_sspi( ret ); +#else + FIXME( "(%lx %lx %s 0x%08x %u %p %p %p %p %p %p %p)\n", credential, context, debugstr_us(target_name), + context_req, target_data_rep, input, new_context, output, context_attr, ts_expiry, + mapped_context, context_data ); + return SEC_E_UNSUPPORTED_FUNCTION; +#endif +} + static NTSTATUS NTAPI kerberos_SpInitialize(ULONG_PTR package_id, SECPKG_PARAMETERS *params, LSA_SECPKG_FUNCTION_TABLE *lsa_function_table) { @@ -387,7 +526,7 @@ static SECPKG_FUNCTION_TABLE kerberos_table = NULL, /* SaveCredentials */ NULL, /* GetCredentials */ NULL, /* DeleteCredentials */ - NULL, /* InitLsaModeContext */ + kerberos_SpInitLsaModeContext, NULL, /* AcceptLsaModeContext */ NULL, /* DeleteContext */ NULL, /* ApplyControlToken */

1 0

Hans Leidekker : kerberos: Implement SpAcquireCredentialsHandle.
by Alexandre Julliard 24 Jan '18

24 Jan '18

Module: wine Branch: master Commit: 737d464e759d5d24d62e79181be5a5e84d08a022 URL: https://source.winehq.org/git/wine.git/?a=commit;h=737d464e759d5d24d62e7918… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 18 23:51:24 2018 +0800 kerberos: Implement SpAcquireCredentialsHandle. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 122 ++++++++++++++++++++++++++ configure.ac | 18 ++++ dlls/kerberos/Makefile.in | 2 +- dlls/kerberos/krb5_ap.c | 216 ++++++++++++++++++++++++++++++++++++++++++---- include/config.h.in | 9 ++ 5 files changed, 350 insertions(+), 17 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=737d464e759d5d24d62e…

1 0

Hans Leidekker : webervices/tests: Add tests for out of range string IDs.
by Alexandre Julliard 24 Jan '18

24 Jan '18

Module: wine Branch: master Commit: e3851a87404841b3550e78f1b1bf2f153a1a280b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3851a87404841b3550e78f1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 24 14:30:02 2018 +0100 webervices/tests: Add tests for out of range string IDs. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/reader.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 9879fac..7064cf0 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -5612,6 +5612,10 @@ static void test_dictionary(void) {0x40,0x01,'t',0x0a,0x0a,0x01}; static const char test8[] = {0x40,0x01,'t',0x0b,0x01,'p',0x0a,0x01}; + static const char test9[] = + {0x42,0x0c,0x01}; + static const char test10[] = + {0x42,0x04,0xab,0x0c,0x01}; const WS_XML_NODE *node; const WS_XML_ELEMENT_NODE *elem; const WS_XML_ATTRIBUTE *attr; @@ -5940,6 +5944,23 @@ static void test_dictionary(void) ok( hr == S_OK, "got %08x\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); + /* element name string id out of range */ + hr = set_input_bin( reader, test9, sizeof(test9), &dict ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsReadNode( reader, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + /* text string id out of range */ + hr = set_input_bin( reader, test10, sizeof(test10), &dict ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); + hr = WsReadNode( reader, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + hr = WsGetDictionary( 0, NULL, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr );

1 0

Hans Leidekker : webservices: Also set localname and value for xmlns attributes.
by Alexandre Julliard 24 Jan '18

24 Jan '18

Module: wine Branch: master Commit: 69ea451bdef891dafcb15b904079a3365a5393d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69ea451bdef891dafcb15b90… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 24 14:30:01 2018 +0100 webservices: Also set localname and value for xmlns attributes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 39 +++++++++++ dlls/webservices/tests/reader.c | 142 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 169 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=69ea451bdef891dafcb1…

1 0

Hans Leidekker : webservices: Simplify write_dict_string.
by Alexandre Julliard 24 Jan '18

24 Jan '18

Module: wine Branch: master Commit: 5afd702c9982f1ce6339e41d91341e23c25dc450 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5afd702c9982f1ce6339e41d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 24 14:30:00 2018 +0100 webservices: Simplify write_dict_string. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index b7dab3a..75cf7b4 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -648,10 +648,8 @@ static HRESULT write_string( struct writer *writer, const BYTE *bytes, ULONG len static HRESULT write_dict_string( struct writer *writer, ULONG id ) { - HRESULT hr; if (id > 0x7fffffff) return E_INVALIDARG; - if ((hr = write_int31( writer, id )) != S_OK) return hr; - return S_OK; + return write_int31( writer, id ); } static enum record_type get_attr_text_record_type( const WS_XML_TEXT *text, BOOL use_dict )

1 0

Hans Leidekker : webservices: Don' t write a colon for namespace attributes with empty prefix.
by Alexandre Julliard 24 Jan '18

24 Jan '18

Module: wine Branch: master Commit: 3b6f7148b66f8453fa8667d62fe7e529cc10fb89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b6f7148b66f8453fa8667d6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 24 14:29:59 2018 +0100 webservices: Don't write a colon for namespace attributes with empty prefix. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 08b3410..b7dab3a 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1482,11 +1482,11 @@ static HRESULT write_namespace_attribute_text( struct writer *writer, const WS_X /* ' xmlns:prefix="namespace"' */ size = attr->ns->length + 9 /* ' xmlns=""' */; - if (attr->prefix) size += attr->prefix->length + 1 /* ':' */; + if (attr->prefix && attr->prefix->length) size += attr->prefix->length + 1 /* ':' */; if ((hr = write_grow_buffer( writer, size )) != S_OK) return hr; write_bytes( writer, (const BYTE *)" xmlns", 6 ); - if (attr->prefix) + if (attr->prefix && attr->prefix->length) { write_char( writer, ':' ); write_bytes( writer, attr->prefix->bytes, attr->prefix->length );

1 0

Hans Leidekker : webservices: Take the output encoding into account in WsCopyNode.
by Alexandre Julliard 24 Jan '18

24 Jan '18

Module: wine Branch: master Commit: a3f80e3ab5210261b76804c5fb6927697035a210 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3f80e3ab5210261b76804c5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 24 14:29:58 2018 +0100 webservices: Take the output encoding into account in WsCopyNode. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 95 +++++++++++++++++++++------------- dlls/webservices/webservices_private.h | 5 +- dlls/webservices/writer.c | 8 +-- 3 files changed, 65 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a3f80e3ab5210261b768…

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
64
Older →

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 January 2018