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

[PATCH 2/9] secur32: Implement DeleteSecurityContext in the SSP/AP wrapper.
by Dmitry Timoshkov 01 Feb '18

01 Feb '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 4ed6a06caf..628614cbed 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -466,6 +466,26 @@ static SECURITY_STATUS WINAPI lsa_InitializeSecurityContextA( return status; } +static SECURITY_STATUS WINAPI lsa_DeleteSecurityContext(CtxtHandle *context) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_context; + + TRACE("%p\n", context); + + if (!context) return SEC_E_INVALID_HANDLE; + + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + + if (!lsa_package) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->lsa_api || !lsa_package->lsa_api->DeleteContext) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->lsa_api->DeleteContext(lsa_context); +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -477,7 +497,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = lsa_InitializeSecurityContextW, NULL, /* AcceptSecurityContext */ NULL, /* CompleteAuthToken */ - NULL, /* DeleteSecurityContext */ + lsa_DeleteSecurityContext, NULL, /* ApplyControlToken */ NULL, /* QueryContextAttributesW */ NULL, /* ImpersonateSecurityContext */ @@ -509,7 +529,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = lsa_InitializeSecurityContextA, NULL, /* AcceptSecurityContext */ NULL, /* CompleteAuthToken */ - NULL, /* DeleteSecurityContext */ + lsa_DeleteSecurityContext, NULL, /* ApplyControlToken */ NULL, /* QueryContextAttributesA */ NULL, /* ImpersonateSecurityContext */ -- 2.15.1

1 0

[PATCH 1/9] secur32: Implement InitializeSecurityContext in the SSP/AP wrapper. (v2)
by Dmitry Timoshkov 01 Feb '18

01 Feb '18

Partially based on Hans Leidekker's work. v2: switch order of context vs. credentials initialization initialize context also in case of SEC_I_CONTINUE_NEEDED Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 72 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 1916aa4b3a..4ed6a06caf 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -396,6 +396,76 @@ static SECURITY_STATUS WINAPI lsa_FreeCredentialsHandle(CredHandle *credential) return lsa_package->lsa_api->FreeCredentialsHandle(lsa_credential); } +static SECURITY_STATUS WINAPI lsa_InitializeSecurityContextW( + CredHandle *credential, CtxtHandle *context, SEC_WCHAR *target_name, ULONG context_req, + ULONG reserved1, ULONG target_data_rep, SecBufferDesc *input, ULONG reserved2, + CtxtHandle *new_context, SecBufferDesc *output, ULONG *context_attr, TimeStamp *ts_expiry) +{ + SECURITY_STATUS status; + struct lsa_package *lsa_package = NULL; + LSA_SEC_HANDLE lsa_credential = 0, lsa_context = 0, new_lsa_context; + UNICODE_STRING target_name_us; + BOOLEAN mapped_context; + + TRACE("%p %p %s %#x %d %d %p %d %p %p %p %p\n", credential, context, + debugstr_w(target_name), context_req, reserved1, target_data_rep, input, + reserved2, new_context, output, context_attr, ts_expiry); + + if (context) + { + lsa_package = (struct lsa_package *)credential->dwUpper; + lsa_credential = (LSA_SEC_HANDLE)credential->dwLower; + } + else if (credential) + { + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + } + + if (!lsa_package || !new_context) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->lsa_api || !lsa_package->lsa_api->InitLsaModeContext) + return SEC_E_UNSUPPORTED_FUNCTION; + + if (target_name) + RtlInitUnicodeString(&target_name_us, target_name); + + status = lsa_package->lsa_api->InitLsaModeContext(lsa_credential, lsa_context, + target_name ? &target_name_us : NULL, context_req, target_data_rep, input, + &new_lsa_context, output, context_attr, ts_expiry, &mapped_context, NULL /* FIXME */); + if (status == SEC_E_OK || status == SEC_I_CONTINUE_NEEDED) + { + new_context->dwLower = (ULONG_PTR)new_lsa_context; + new_context->dwUpper = (ULONG_PTR)lsa_package; + } + return status; +} + +static SECURITY_STATUS WINAPI lsa_InitializeSecurityContextA( + CredHandle *credential, CtxtHandle *context, SEC_CHAR *target_name, ULONG context_req, + ULONG reserved1, ULONG target_data_rep, SecBufferDesc *input, ULONG reserved2, + CtxtHandle *new_context, SecBufferDesc *output, ULONG *context_attr, TimeStamp *ts_expiry) +{ + SECURITY_STATUS status; + SEC_WCHAR *targetW = NULL; + + TRACE("%p %p %s %#x %d %d %p %d %p %p %p %p\n", credential, context, + debugstr_a(target_name), context_req, reserved1, target_data_rep, input, + reserved2, new_context, output, context_attr, ts_expiry); + + if (target_name) + { + int len = MultiByteToWideChar( CP_ACP, 0, target_name, -1, NULL, 0 ); + if (!(targetW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(SEC_WCHAR) ))) return SEC_E_INSUFFICIENT_MEMORY; + MultiByteToWideChar( CP_ACP, 0, target_name, -1, targetW, len ); + } + + status = lsa_InitializeSecurityContextW( credential, context, targetW, context_req, reserved1, target_data_rep, + input, reserved2, new_context, output, context_attr, ts_expiry ); + HeapFree( GetProcessHeap(), 0, targetW ); + return status; +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -404,7 +474,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = lsa_AcquireCredentialsHandleW, lsa_FreeCredentialsHandle, NULL, /* Reserved2 */ - NULL, /* InitializeSecurityContextW */ + lsa_InitializeSecurityContextW, NULL, /* AcceptSecurityContext */ NULL, /* CompleteAuthToken */ NULL, /* DeleteSecurityContext */ @@ -436,7 +506,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = lsa_AcquireCredentialsHandleA, lsa_FreeCredentialsHandle, NULL, /* Reserved2 */ - NULL, /* InitializeSecurityContextA */ + lsa_InitializeSecurityContextA, NULL, /* AcceptSecurityContext */ NULL, /* CompleteAuthToken */ NULL, /* DeleteSecurityContext */ -- 2.15.1

1 0

[PATCH 4/4] crypt32: Always set returned size in CRYPT_CopySignerInfo.
by Jacek Caban 01 Feb '18

01 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/crypt32/msg.c | 3 +-- dlls/crypt32/tests/msg.c | 5 ++++- 2 files changed, 5 insertions(+), 3 deletions(-)

1 0

[PATCH 3/4] crypt32: Fixed decoded size calculation in CRYPT_AsnDecodeSequence when indefinite length is used.
by Jacek Caban 01 Feb '18

01 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/crypt32/decode.c | 1 + dlls/crypt32/tests/encode.c | 105 +++++++++++++++++++++++++++++++++++++++----- 2 files changed, 94 insertions(+), 12 deletions(-)

1 0

[PATCH 2/4] crypt32/tests: Added more decoding tests.
by Jacek Caban 01 Feb '18

01 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/crypt32/tests/encode.c | 238 +++++++++++++++++++++++++++++--------------- 1 file changed, 157 insertions(+), 81 deletions(-)

1 0

[PATCH 1/4] crypt32: Support constructed strings in octet strings decoder.
by Jacek Caban 01 Feb '18

01 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/crypt32/decode.c | 146 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 117 insertions(+), 29 deletions(-)

1 0