wine-devel January 2018

wine-devel@winehq.org

62 participants
503 discussions

[PATCH 2/6] wined3d: Use the resource access flags in resource_cleanup().
by Henri Verbeet 31 Jan '18

31 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 172a054..44f9f00 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -262,7 +262,7 @@ void resource_cleanup(struct wined3d_resource *resource) if (!(resource->usage & WINED3DUSAGE_PRIVATE)) { - if (resource->pool == WINED3D_POOL_DEFAULT && d3d->flags & WINED3D_VIDMEM_ACCOUNTING) + if (!(resource->access & WINED3D_RESOURCE_ACCESS_CPU) && d3d->flags & WINED3D_VIDMEM_ACCOUNTING) { TRACE("Decrementing device memory pool by %u.\n", resource->size); adapter_adjust_memory(resource->device->adapter, (INT64)0 - resource->size); -- 2.1.4

1 0

[PATCH 1/6] wined3d: Use the resource access flags in resource_init().
by Henri Verbeet 31 Jan '18

31 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/resource.c | 12 +++++++----- dlls/wined3d/utils.c | 16 ++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index cf01f93..172a054 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -83,6 +83,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * enum wined3d_gl_resource_type base_type = WINED3D_GL_RES_TYPE_COUNT; enum wined3d_gl_resource_type gl_type = WINED3D_GL_RES_TYPE_COUNT; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + DWORD access = resource_access_from_pool(pool); BOOL tex_2d_ok = FALSE; unsigned int i; @@ -104,9 +105,10 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource_check_usage(usage); - if (usage & WINED3DUSAGE_SCRATCH && pool != WINED3D_POOL_SYSTEM_MEM) + if (usage & WINED3DUSAGE_SCRATCH && access & WINED3D_RESOURCE_ACCESS_GPU) { - ERR("WINED3DUSAGE_SCRATCH used with pool %s.\n", debug_d3dpool(pool)); + ERR("Trying to create a scratch resource with access flags %s.\n", + wined3d_debug_resource_access(access)); return WINED3DERR_INVALIDCALL; } @@ -197,9 +199,9 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource->multisample_quality = multisample_quality; resource->usage = usage; resource->pool = pool; - resource->access = resource_access_from_pool(pool); if (usage & WINED3DUSAGE_DYNAMIC) - resource->access |= WINED3D_RESOURCE_ACCESS_MAP; + access |= WINED3D_RESOURCE_ACCESS_MAP; + resource->access = access; resource->width = width; resource->height = height; resource->depth = depth; @@ -226,7 +228,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * if (!(usage & WINED3DUSAGE_PRIVATE)) { /* Check that we have enough video ram left */ - if (pool == WINED3D_POOL_DEFAULT && device->wined3d->flags & WINED3D_VIDMEM_ACCOUNTING) + if (!(access & WINED3D_RESOURCE_ACCESS_CPU) && device->wined3d->flags & WINED3D_VIDMEM_ACCOUNTING) { if (size > wined3d_device_get_available_texture_mem(device)) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index bd8aa06..a79c3af 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4129,6 +4129,22 @@ const char *debug_d3ddevicetype(enum wined3d_device_type device_type) } } +const char *wined3d_debug_resource_access(DWORD access) +{ + char buf[91]; + + buf[0] = '\0'; +#define ACCESS_TO_STR(x) if (access & x) { strcat(buf, " | "#x); access &= ~x; } + ACCESS_TO_STR(WINED3D_RESOURCE_ACCESS_GPU); + ACCESS_TO_STR(WINED3D_RESOURCE_ACCESS_CPU); + ACCESS_TO_STR(WINED3D_RESOURCE_ACCESS_MAP); +#undef ACCESS_TO_STR + if (access) + FIXME("Unrecognised access flag(s) %#x.\n", access); + + return buf[0] ? wine_dbg_sprintf("%s", &buf[3]) : "0"; +} + const char *debug_d3dusage(DWORD usage) { char buf[552]; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f95330f..8006f3a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2965,6 +2965,8 @@ static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD sta #define WINED3D_RESOURCE_ACCESS_CPU 0x2u #define WINED3D_RESOURCE_ACCESS_MAP 0x4u +const char *wined3d_debug_resource_access(DWORD access) DECLSPEC_HIDDEN; + static inline BOOL wined3d_resource_access_is_managed(unsigned int access) { return !(~access & (WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU)); -- 2.1.4

1 0

[PATCH 04/13] secur32: Implement InitializeSecurityContext in the SSP/AP wrapper.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Partially based on Hans Leidekker's work. 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 ad3223c166..fe7ccb418d 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 (credential) + { + lsa_package = (struct lsa_package *)credential->dwUpper; + lsa_credential = (LSA_SEC_HANDLE)credential->dwLower; + } + else if (context) + { + 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) + { + 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

2 2

[PATCH 13/13] secur32: Add support for switching between Kerberos and NTLM in Negotiate provider.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Based on generic wrapper.c implementation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/negotiate.c | 330 ++++++++++++++++++++++++++++++++++++-------- dlls/secur32/ntlm.c | 4 +- dlls/secur32/secur32_priv.h | 19 +-- dlls/secur32/wrapper.c | 2 +- 4 files changed, 277 insertions(+), 78 deletions(-) diff --git a/dlls/secur32/negotiate.c b/dlls/secur32/negotiate.c index bf16258fc2..c7ab97ef79 100644 --- a/dlls/secur32/negotiate.c +++ b/dlls/secur32/negotiate.c @@ -62,20 +62,41 @@ static SECURITY_STATUS SEC_ENTRY nego_AcquireCredentialsHandleW( PVOID pGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry ) { static SEC_WCHAR ntlmW[] = {'N','T','L','M',0}; + static SEC_WCHAR kerberosW[] = {'K','e','r','b','e','r','o','s',0}; SECURITY_STATUS ret; + SecurePackage *package; + CredHandle myCred; TRACE("%s, %s, 0x%08x, %p, %p, %p, %p, %p, %p\n", debugstr_w(pszPrincipal), debugstr_w(pszPackage), fCredentialUse, pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry); - FIXME("forwarding to NTLM\n"); - ret = ntlm_AcquireCredentialsHandleW( pszPrincipal, ntlmW, fCredentialUse, - pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, - phCredential, ptsExpiry ); + if (!pszPackage) + return SEC_E_SECPKG_NOT_FOUND; + + package = SECUR32_findPackageW(kerberosW); + if (!package || !package->provider) + { + package = SECUR32_findPackageW(ntlmW); + if (!package || !package->provider) + return SEC_E_SECPKG_NOT_FOUND; + } + + if (!package->provider->fnTableW.AcquireCredentialsHandleW) + { + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + ret = package->provider->fnTableW.AcquireCredentialsHandleW( + pszPrincipal, package->infoW.Name, fCredentialUse, pLogonID, + pAuthData, pGetKeyFn, pGetKeyArgument, &myCred, + ptsExpiry); if (ret == SEC_E_OK) { - NtlmCredentials *cred = (NtlmCredentials *)phCredential->dwLower; - cred->no_cached_credentials = (pAuthData == NULL); + ret = SECUR32_makeSecHandle(phCredential, package, &myCred); + if (ret != SEC_E_OK) + package->provider->fnTableW.FreeCredentialsHandle(&myCred); } return ret; } @@ -173,15 +194,56 @@ static SECURITY_STATUS SEC_ENTRY nego_InitializeSecurityContextW( PSecBufferDesc pInput, ULONG Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput, ULONG *pfContextAttr, PTimeStamp ptsExpiry ) { + SECURITY_STATUS ret; + SecurePackage *package = NULL; + PCredHandle cred = NULL; + PCredHandle ctxt = NULL; + CtxtHandle myCtxt; + TRACE("%p, %p, %s, 0x%08x, %u, %u, %p, %u, %p, %p, %p, %p\n", phCredential, phContext, debugstr_w(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); - return ntlm_InitializeSecurityContextW( phCredential, phContext, pszTargetName, - fContextReq, Reserved1, TargetDataRep, - pInput, Reserved2, phNewContext, - pOutput, pfContextAttr, ptsExpiry ); + if (phContext) + { + package = (SecurePackage *)phContext->dwUpper; + ctxt = (PCtxtHandle)phContext->dwLower; + } + if (phCredential) + { + package = (SecurePackage *)phCredential->dwUpper; + cred = (PCredHandle)phCredential->dwLower; + } + + if (!package || !package->provider) + return SEC_E_INVALID_HANDLE; + + if (!package->provider->fnTableW.InitializeSecurityContextW) + { + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + if (phContext) + { + PCtxtHandle realCtxt = (PCtxtHandle)phContext->dwLower; + myCtxt.dwUpper = realCtxt->dwUpper; + myCtxt.dwLower = realCtxt->dwLower; + } + + ret = package->provider->fnTableW.InitializeSecurityContextW( + cred, ctxt, pszTargetName, fContextReq, + Reserved1, TargetDataRep, pInput, Reserved2, phNewContext ? &myCtxt : NULL, + pOutput, pfContextAttr, ptsExpiry); + if ((ret == SEC_E_OK || ret == SEC_I_CONTINUE_NEEDED) && + phNewContext && phNewContext != phContext) + { + if (SECUR32_makeSecHandle(phNewContext, package, &myCtxt) != SEC_E_OK) + package->provider->fnTableW.DeleteSecurityContext(&myCtxt); + } + + return ret; } /*********************************************************************** @@ -223,13 +285,49 @@ static SECURITY_STATUS SEC_ENTRY nego_AcceptSecurityContext( ULONG fContextReq, ULONG TargetDataRep, PCtxtHandle phNewContext, PSecBufferDesc pOutput, ULONG *pfContextAttr, PTimeStamp ptsExpiry) { + SecurePackage *package; + PCredHandle cred; + CtxtHandle myCtxt; + SECURITY_STATUS ret; + TRACE("%p, %p, %p, 0x%08x, %u, %p, %p, %p, %p\n", phCredential, phContext, pInput, fContextReq, TargetDataRep, phNewContext, pOutput, pfContextAttr, ptsExpiry); - return ntlm_AcceptSecurityContext( phCredential, phContext, pInput, - fContextReq, TargetDataRep, phNewContext, - pOutput, pfContextAttr, ptsExpiry ); + if (!phCredential) + return SEC_E_INVALID_HANDLE; + + package = (SecurePackage *)phCredential->dwUpper; + cred = (PCredHandle)phCredential->dwLower; + + if (!package || !package->provider) + return SEC_E_INVALID_HANDLE; + + if (!package->provider->fnTableW.AcceptSecurityContext) + { + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + if(phContext) + { + PCtxtHandle realCtxt = (PCtxtHandle)phContext->dwLower; + TRACE("realCtx: %p\n", realCtxt); + myCtxt.dwUpper = realCtxt->dwUpper; + myCtxt.dwLower = realCtxt->dwLower; + } + + ret = package->provider->fnTableW.AcceptSecurityContext( + cred, phContext ? &myCtxt : NULL, pInput, fContextReq, + TargetDataRep, &myCtxt, pOutput, pfContextAttr, ptsExpiry); + if ((ret == SEC_E_OK || ret == SEC_I_CONTINUE_NEEDED) && + phNewContext && phNewContext != phContext) + { + if (SECUR32_makeSecHandle(phNewContext, package, &myCtxt) != SEC_E_OK) + package->provider->fnTableW.DeleteSecurityContext(&myCtxt); + } + + return ret; } /*********************************************************************** @@ -257,9 +355,31 @@ static SECURITY_STATUS SEC_ENTRY nego_CompleteAuthToken(PCtxtHandle phContext, */ static SECURITY_STATUS SEC_ENTRY nego_DeleteSecurityContext(PCtxtHandle phContext) { + SecurePackage *package; + PCtxtHandle ctxt; + SECURITY_STATUS ret; + TRACE("%p\n", phContext); + if (!phContext) + return SEC_E_INVALID_HANDLE; + + package = (SecurePackage *)phContext->dwUpper; + + if (!package || !package->provider) + return SEC_E_INVALID_HANDLE; + + if (!package->provider->fnTableW.DeleteSecurityContext) + { + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + ctxt = (PCtxtHandle)phContext->dwLower; - return ntlm_DeleteSecurityContext( phContext ); + ret = package->provider->fnTableW.DeleteSecurityContext(ctxt); + HeapFree(GetProcessHeap(), 0, ctxt); + + return ret; } /*********************************************************************** @@ -288,29 +408,28 @@ static SECURITY_STATUS SEC_ENTRY nego_ApplyControlToken(PCtxtHandle phContext, static SECURITY_STATUS SEC_ENTRY nego_QueryContextAttributesW( PCtxtHandle phContext, ULONG ulAttribute, void *pBuffer) { + SecurePackage *package; + PCtxtHandle ctxt; + TRACE("%p, %u, %p\n", phContext, ulAttribute, pBuffer); - switch (ulAttribute) - { - case SECPKG_ATTR_SIZES: - { - SecPkgContext_Sizes *sizes = (SecPkgContext_Sizes *)pBuffer; - sizes->cbMaxToken = 2888; - sizes->cbMaxSignature = 16; - sizes->cbSecurityTrailer = 16; - sizes->cbBlockSize = 0; - return SEC_E_OK; - } - case SECPKG_ATTR_NEGOTIATION_INFO: + if (!phContext) + return SEC_E_INVALID_HANDLE; + + package = (SecurePackage *)phContext->dwUpper; + + if (!package || !package->provider) + return SEC_E_INVALID_HANDLE; + + if (!package->provider->fnTableW.QueryContextAttributesW) { - SecPkgContext_NegotiationInfoW *info = (SecPkgContext_NegotiationInfoW *)pBuffer; - info->PackageInfo = ntlm_package_infoW; - info->NegotiationState = SECPKG_NEGOTIATION_COMPLETE; - return SEC_E_OK; - } - default: - return ntlm_QueryContextAttributesW( phContext, ulAttribute, pBuffer ); + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; } + + ctxt = (PCtxtHandle)phContext->dwLower; + + return package->provider->fnTableW.QueryContextAttributesW(ctxt, ulAttribute, pBuffer); } /*********************************************************************** @@ -319,29 +438,28 @@ static SECURITY_STATUS SEC_ENTRY nego_QueryContextAttributesW( static SECURITY_STATUS SEC_ENTRY nego_QueryContextAttributesA(PCtxtHandle phContext, ULONG ulAttribute, void *pBuffer) { + SecurePackage *package; + PCtxtHandle ctxt; + TRACE("%p, %u, %p\n", phContext, ulAttribute, pBuffer); - switch (ulAttribute) - { - case SECPKG_ATTR_SIZES: - { - SecPkgContext_Sizes *sizes = (SecPkgContext_Sizes *)pBuffer; - sizes->cbMaxToken = 2888; - sizes->cbMaxSignature = 16; - sizes->cbSecurityTrailer = 16; - sizes->cbBlockSize = 0; - return SEC_E_OK; - } - case SECPKG_ATTR_NEGOTIATION_INFO: + if (!phContext) + return SEC_E_INVALID_HANDLE; + + package = (SecurePackage *)phContext->dwUpper; + + if (!package || !package->provider) + return SEC_E_INVALID_HANDLE; + + if (!package->provider->fnTableA.QueryContextAttributesA) { - SecPkgContext_NegotiationInfoA *info = (SecPkgContext_NegotiationInfoA *)pBuffer; - info->PackageInfo = ntlm_package_infoA; - info->NegotiationState = SECPKG_NEGOTIATION_COMPLETE; - return SEC_E_OK; - } - default: - return ntlm_QueryContextAttributesA( phContext, ulAttribute, pBuffer ); + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; } + + ctxt = (PCtxtHandle)phContext->dwLower; + + return package->provider->fnTableA.QueryContextAttributesA(ctxt, ulAttribute, pBuffer); } /*********************************************************************** @@ -388,9 +506,28 @@ static SECURITY_STATUS SEC_ENTRY nego_RevertSecurityContext(PCtxtHandle phContex static SECURITY_STATUS SEC_ENTRY nego_MakeSignature(PCtxtHandle phContext, ULONG fQOP, PSecBufferDesc pMessage, ULONG MessageSeqNo) { + SecurePackage *package; + PCtxtHandle ctxt; + TRACE("%p, 0x%08x, %p, %u\n", phContext, fQOP, pMessage, MessageSeqNo); - return ntlm_MakeSignature( phContext, fQOP, pMessage, MessageSeqNo ); + if (!phContext) + return SEC_E_INVALID_HANDLE; + + package = (SecurePackage *)phContext->dwUpper; + + if (!package || !package->provider) + return SEC_E_INVALID_HANDLE; + + if (!package->provider->fnTableW.MakeSignature) + { + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + ctxt = (PCtxtHandle)phContext->dwLower; + + return package->provider->fnTableW.MakeSignature(ctxt, fQOP, pMessage, MessageSeqNo); } /*********************************************************************** @@ -399,9 +536,28 @@ static SECURITY_STATUS SEC_ENTRY nego_MakeSignature(PCtxtHandle phContext, static SECURITY_STATUS SEC_ENTRY nego_VerifySignature(PCtxtHandle phContext, PSecBufferDesc pMessage, ULONG MessageSeqNo, PULONG pfQOP) { + SecurePackage *package; + PCtxtHandle ctxt; + TRACE("%p, %p, %u, %p\n", phContext, pMessage, MessageSeqNo, pfQOP); - return ntlm_VerifySignature( phContext, pMessage, MessageSeqNo, pfQOP ); + if (!phContext) + return SEC_E_INVALID_HANDLE; + + package = (SecurePackage *)phContext->dwUpper; + + if (!package || !package->provider) + return SEC_E_INVALID_HANDLE; + + if (!package->provider->fnTableW.VerifySignature) + { + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + ctxt = (PCtxtHandle)phContext->dwLower; + + return package->provider->fnTableW.VerifySignature(ctxt, pMessage, MessageSeqNo, pfQOP); } /*********************************************************************** @@ -409,9 +565,31 @@ static SECURITY_STATUS SEC_ENTRY nego_VerifySignature(PCtxtHandle phContext, */ static SECURITY_STATUS SEC_ENTRY nego_FreeCredentialsHandle(PCredHandle phCredential) { + SecurePackage *package; + PCredHandle cred; + SECURITY_STATUS ret; + TRACE("%p\n", phCredential); - return ntlm_FreeCredentialsHandle( phCredential ); + if (!phCredential) + return SEC_E_INVALID_HANDLE; + + package = (SecurePackage *)phCredential->dwUpper; + if (!package || !package->provider) + return SEC_E_INVALID_HANDLE; + + if (!package->provider->fnTableW.FreeCredentialsHandle) + { + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + cred = (PCredHandle)phCredential->dwLower; + + ret = package->provider->fnTableW.FreeCredentialsHandle(cred); + HeapFree(GetProcessHeap(), 0, cred); + + return ret; } /*********************************************************************** @@ -420,9 +598,28 @@ static SECURITY_STATUS SEC_ENTRY nego_FreeCredentialsHandle(PCredHandle phCreden static SECURITY_STATUS SEC_ENTRY nego_EncryptMessage(PCtxtHandle phContext, ULONG fQOP, PSecBufferDesc pMessage, ULONG MessageSeqNo) { + SecurePackage *package; + PCtxtHandle ctxt; + TRACE("%p, 0x%08x, %p, %u\n", phContext, fQOP, pMessage, MessageSeqNo); - return ntlm_EncryptMessage( phContext, fQOP, pMessage, MessageSeqNo ); + if (!phContext) + return SEC_E_INVALID_HANDLE; + + package = (SecurePackage *)phContext->dwUpper; + + if (!package || !package->provider) + return SEC_E_INVALID_HANDLE; + + if (!package->provider->fnTableW.EncryptMessage) + { + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + ctxt = (PCtxtHandle)phContext->dwLower; + + return package->provider->fnTableW.EncryptMessage(ctxt, fQOP, pMessage, MessageSeqNo); } /*********************************************************************** @@ -431,9 +628,28 @@ static SECURITY_STATUS SEC_ENTRY nego_EncryptMessage(PCtxtHandle phContext, static SECURITY_STATUS SEC_ENTRY nego_DecryptMessage(PCtxtHandle phContext, PSecBufferDesc pMessage, ULONG MessageSeqNo, PULONG pfQOP) { + SecurePackage *package; + PCtxtHandle ctxt; + TRACE("%p, %p, %u, %p\n", phContext, pMessage, MessageSeqNo, pfQOP); - return ntlm_DecryptMessage( phContext, pMessage, MessageSeqNo, pfQOP ); + if (!phContext) + return SEC_E_INVALID_HANDLE; + + package = (SecurePackage *)phContext->dwUpper; + + if (!package || !package->provider) + return SEC_E_INVALID_HANDLE; + + if (!package->provider->fnTableW.DecryptMessage) + { + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + ctxt = (PCtxtHandle)phContext->dwLower; + + return package->provider->fnTableW.DecryptMessage(ctxt, pMessage, MessageSeqNo, pfQOP); } static const SecurityFunctionTableA negoTableA = { diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 94b94f48ce..2d0557b200 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -151,7 +151,7 @@ SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( ntlm_cred->domain_arg = NULL; ntlm_cred->password = NULL; ntlm_cred->pwlen = 0; - ntlm_cred->no_cached_credentials = 0; + ntlm_cred->no_cached_credentials = (pAuthData == NULL); phCredential->dwUpper = fCredentialUse; phCredential->dwLower = (ULONG_PTR)ntlm_cred; @@ -172,7 +172,7 @@ SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( ntlm_cred->domain_arg = NULL; ntlm_cred->password = NULL; ntlm_cred->pwlen = 0; - ntlm_cred->no_cached_credentials = 0; + ntlm_cred->no_cached_credentials = (pAuthData == NULL); if(pAuthData != NULL) { diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 973b75c699..e029ea12c4 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -189,24 +189,7 @@ void SECUR32_arc4Cleanup(arc4_info *a4i) DECLSPEC_HIDDEN; #define NTLMSSP_NEGOTIATE_KEY_EXCHANGE 0x40000000 #define NTLMSSP_NEGOTIATE_56 0x80000000 -SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW(SEC_WCHAR *, SEC_WCHAR *, - ULONG, PLUID, PVOID, SEC_GET_KEY_FN, PVOID, PCredHandle, PTimeStamp) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW(PCredHandle, PCtxtHandle, - SEC_WCHAR *, ULONG fContextReq, ULONG, ULONG, PSecBufferDesc, ULONG, PCtxtHandle, - PSecBufferDesc, ULONG *, PTimeStamp) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_AcceptSecurityContext(PCredHandle, PCtxtHandle, PSecBufferDesc, - ULONG, ULONG, PCtxtHandle, PSecBufferDesc, ULONG *, PTimeStamp) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesA(PCtxtHandle, ULONG, void *) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesW(PCtxtHandle, ULONG, void *) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_EncryptMessage(PCtxtHandle, ULONG, PSecBufferDesc, ULONG) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_DecryptMessage(PCtxtHandle, PSecBufferDesc, ULONG, PULONG) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_FreeCredentialsHandle(PCredHandle) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_DeleteSecurityContext(PCtxtHandle) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_MakeSignature(PCtxtHandle, ULONG, PSecBufferDesc, ULONG) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_VerifySignature(PCtxtHandle, PSecBufferDesc, ULONG, PULONG) DECLSPEC_HIDDEN; - -SecPkgInfoW *ntlm_package_infoW DECLSPEC_HIDDEN; -SecPkgInfoA *ntlm_package_infoA DECLSPEC_HIDDEN; +SECURITY_STATUS SECUR32_makeSecHandle(PSecHandle phSec, SecurePackage *package, PSecHandle realHandle) DECLSPEC_HIDDEN; /* schannel internal interface */ typedef struct schan_imp_session_opaque *schan_imp_session; diff --git a/dlls/secur32/wrapper.c b/dlls/secur32/wrapper.c index dba675422d..85941d0361 100644 --- a/dlls/secur32/wrapper.c +++ b/dlls/secur32/wrapper.c @@ -32,7 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(secur32); * and stored in phSec->dwLower). SecHandle is equivalent to both a * CredHandle and a CtxtHandle. */ -static SECURITY_STATUS SECUR32_makeSecHandle(PSecHandle phSec, +SECURITY_STATUS SECUR32_makeSecHandle(PSecHandle phSec, SecurePackage *package, PSecHandle realHandle) { SECURITY_STATUS ret; -- 2.15.1

2 1

[PATCH 12/13] secur32: Remove Kerberos SSPI stubs.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/Makefile.in | 1 - dlls/secur32/kerberos.c | 323 -------------------------------------------- dlls/secur32/secur32.c | 3 +- dlls/secur32/secur32_priv.h | 2 +- 4 files changed, 3 insertions(+), 326 deletions(-) delete mode 100644 dlls/secur32/kerberos.c diff --git a/dlls/secur32/Makefile.in b/dlls/secur32/Makefile.in index 6548521f53..c9acdee457 100644 --- a/dlls/secur32/Makefile.in +++ b/dlls/secur32/Makefile.in @@ -9,7 +9,6 @@ C_SRCS = \ base64_codec.c \ dispatcher.c \ hmac_md5.c \ - kerberos.c \ lsa.c \ negotiate.c \ ntlm.c \ diff --git a/dlls/secur32/kerberos.c b/dlls/secur32/kerberos.c deleted file mode 100644 index 753e9748d2..0000000000 --- a/dlls/secur32/kerberos.c +++ /dev/null @@ -1,323 +0,0 @@ -/* - * Copyright 2005, 2006 Kai Blin - * Copyright 2016 Jacek Caban for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <assert.h> -#include <stdarg.h> -#include <stdio.h> - -#include "windef.h" -#include "winbase.h" -#include "rpc.h" -#include "sspi.h" - -#include "secur32_priv.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(secur32); - -#define KERBEROS_MAX_BUF 12000 - -/*********************************************************************** - * QueryCredentialsAttributesA - */ -static SECURITY_STATUS SEC_ENTRY kerberos_QueryCredentialsAttributesA(CredHandle *phCredential, ULONG ulAttribute, void *pBuffer) -{ - FIXME("(%p %d %p)\n", phCredential, ulAttribute, pBuffer); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * QueryCredentialsAttributesW - */ -static SECURITY_STATUS SEC_ENTRY kerberos_QueryCredentialsAttributesW(CredHandle *phCredential, ULONG ulAttribute, void *pBuffer) -{ - FIXME("(%p, %d, %p)\n", phCredential, ulAttribute, pBuffer); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * AcquireCredentialsHandleW - */ -static SECURITY_STATUS SEC_ENTRY kerberos_AcquireCredentialsHandleW(SEC_WCHAR *pszPrincipal, SEC_WCHAR *pszPackage, ULONG fCredentialUse, - LUID *pLogonID, void *pAuthData, SEC_GET_KEY_FN pGetKeyFn, void *pGetKeyArgument, CredHandle *phCredential, TimeStamp *ptsExpiry) -{ - FIXME("(%s %s 0x%08x %p %p %p %p %p %p)\n", debugstr_w(pszPrincipal), debugstr_w(pszPackage), fCredentialUse, - pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry); - return SEC_E_NO_CREDENTIALS; -} - -/*********************************************************************** - * AcquireCredentialsHandleA - */ -static SECURITY_STATUS SEC_ENTRY kerberos_AcquireCredentialsHandleA(SEC_CHAR *pszPrincipal, SEC_CHAR *pszPackage, ULONG fCredentialUse, - LUID *pLogonID, void *pAuthData, SEC_GET_KEY_FN pGetKeyFn, void *pGetKeyArgument, CredHandle *phCredential, TimeStamp *ptsExpiry) -{ - FIXME("(%s %s 0x%08x %p %p %p %p %p %p)\n", debugstr_a(pszPrincipal), debugstr_a(pszPackage), fCredentialUse, - pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * InitializeSecurityContextW - */ -static SECURITY_STATUS SEC_ENTRY kerberos_InitializeSecurityContextW(CredHandle *phCredential, CtxtHandle *phContext, SEC_WCHAR *pszTargetName, - ULONG fContextReq, ULONG Reserved1, ULONG TargetDataRep, SecBufferDesc *pInput, ULONG Reserved2, CtxtHandle *phNewContext, - SecBufferDesc *pOutput, ULONG *pfContextAttr, TimeStamp *ptsExpiry) -{ - FIXME("(%p %p %s 0x%08x %d %d %p %d %p %p %p %p)\n", phCredential, phContext, debugstr_w(pszTargetName), - fContextReq, Reserved1, TargetDataRep, pInput, Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * InitializeSecurityContextA - */ -static SECURITY_STATUS SEC_ENTRY kerberos_InitializeSecurityContextA(CredHandle *phCredential, CtxtHandle *phContext, SEC_CHAR *pszTargetName, - ULONG fContextReq, ULONG Reserved1, ULONG TargetDataRep, SecBufferDesc *pInput, ULONG Reserved2, CtxtHandle *phNewContext, - SecBufferDesc *pOutput, ULONG *pfContextAttr, TimeStamp *ptsExpiry) -{ - FIXME("%p %p %s %d %d %d %p %d %p %p %p %p\n", phCredential, phContext, debugstr_a(pszTargetName), fContextReq, - Reserved1, TargetDataRep, pInput, Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * AcceptSecurityContext - */ -static SECURITY_STATUS SEC_ENTRY kerberos_AcceptSecurityContext(CredHandle *phCredential, CtxtHandle *phContext, SecBufferDesc *pInput, - ULONG fContextReq, ULONG TargetDataRep, CtxtHandle *phNewContext, SecBufferDesc *pOutput, ULONG *pfContextAttr, TimeStamp *ptsExpiry) -{ - FIXME("(%p %p %p %d %d %p %p %p %p)\n", phCredential, phContext, pInput, fContextReq, TargetDataRep, phNewContext, pOutput, - pfContextAttr, ptsExpiry); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * CompleteAuthToken - */ -static SECURITY_STATUS SEC_ENTRY kerberos_CompleteAuthToken(CtxtHandle *phContext, SecBufferDesc *pToken) -{ - FIXME("(%p %p)\n", phContext, pToken); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * DeleteSecurityContext - */ -static SECURITY_STATUS SEC_ENTRY kerberos_DeleteSecurityContext(CtxtHandle *phContext) -{ - FIXME("(%p)\n", phContext); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * QueryContextAttributesW - */ -static SECURITY_STATUS SEC_ENTRY kerberos_QueryContextAttributesW(CtxtHandle *phContext, ULONG ulAttribute, void *pBuffer) -{ - FIXME("(%p %d %p)\n", phContext, ulAttribute, pBuffer); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * QueryContextAttributesA - */ -static SECURITY_STATUS SEC_ENTRY kerberos_QueryContextAttributesA(CtxtHandle *phContext, ULONG ulAttribute, void *pBuffer) -{ - FIXME("(%p %d %p)\n", phContext, ulAttribute, pBuffer); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * ImpersonateSecurityContext - */ -static SECURITY_STATUS SEC_ENTRY kerberos_ImpersonateSecurityContext(CtxtHandle *phContext) -{ - FIXME("(%p)\n", phContext); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * RevertSecurityContext - */ -static SECURITY_STATUS SEC_ENTRY kerberos_RevertSecurityContext(CtxtHandle *phContext) -{ - FIXME("(%p)\n", phContext); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * MakeSignature - */ -static SECURITY_STATUS SEC_ENTRY kerberos_MakeSignature(CtxtHandle *phContext, ULONG fQOP, SecBufferDesc *pMessage, ULONG MessageSeqNo) -{ - FIXME("(%p %d %p %d)\n", phContext, fQOP, pMessage, MessageSeqNo); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * VerifySignature - */ -static SECURITY_STATUS SEC_ENTRY kerberos_VerifySignature(CtxtHandle *phContext, SecBufferDesc *pMessage, ULONG MessageSeqNo, PULONG pfQOP) -{ - FIXME("(%p %p %d %p)\n", phContext, pMessage, MessageSeqNo, pfQOP); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * FreeCredentialsHandle - */ -static SECURITY_STATUS SEC_ENTRY kerberos_FreeCredentialsHandle(PCredHandle phCredential) -{ - FIXME("(%p)\n", phCredential); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * EncryptMessage - */ -static SECURITY_STATUS SEC_ENTRY kerberos_EncryptMessage(CtxtHandle *phContext, ULONG fQOP, SecBufferDesc *pMessage, ULONG MessageSeqNo) -{ - FIXME("(%p %d %p %d)\n", phContext, fQOP, pMessage, MessageSeqNo); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * DecryptMessage - */ -static SECURITY_STATUS SEC_ENTRY kerberos_DecryptMessage(CtxtHandle *phContext, SecBufferDesc *pMessage, ULONG MessageSeqNo, PULONG pfQOP) -{ - FIXME("(%p %p %d %p)\n", phContext, pMessage, MessageSeqNo, pfQOP); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -static const SecurityFunctionTableA kerberosTableA = { - 1, - NULL, /* EnumerateSecurityPackagesA */ - kerberos_QueryCredentialsAttributesA, /* QueryCredentialsAttributesA */ - kerberos_AcquireCredentialsHandleA, /* AcquireCredentialsHandleA */ - kerberos_FreeCredentialsHandle, /* FreeCredentialsHandle */ - NULL, /* Reserved2 */ - kerberos_InitializeSecurityContextA, /* InitializeSecurityContextA */ - kerberos_AcceptSecurityContext, /* AcceptSecurityContext */ - kerberos_CompleteAuthToken, /* CompleteAuthToken */ - kerberos_DeleteSecurityContext, /* DeleteSecurityContext */ - NULL, /* ApplyControlToken */ - kerberos_QueryContextAttributesA, /* QueryContextAttributesA */ - kerberos_ImpersonateSecurityContext, /* ImpersonateSecurityContext */ - kerberos_RevertSecurityContext, /* RevertSecurityContext */ - kerberos_MakeSignature, /* MakeSignature */ - kerberos_VerifySignature, /* VerifySignature */ - FreeContextBuffer, /* FreeContextBuffer */ - NULL, /* QuerySecurityPackageInfoA */ - NULL, /* Reserved3 */ - NULL, /* Reserved4 */ - NULL, /* ExportSecurityContext */ - NULL, /* ImportSecurityContextA */ - NULL, /* AddCredentialsA */ - NULL, /* Reserved8 */ - NULL, /* QuerySecurityContextToken */ - kerberos_EncryptMessage, /* EncryptMessage */ - kerberos_DecryptMessage, /* DecryptMessage */ - NULL, /* SetContextAttributesA */ -}; - -static const SecurityFunctionTableW kerberosTableW = { - 1, - NULL, /* EnumerateSecurityPackagesW */ - kerberos_QueryCredentialsAttributesW, /* QueryCredentialsAttributesW */ - kerberos_AcquireCredentialsHandleW, /* AcquireCredentialsHandleW */ - kerberos_FreeCredentialsHandle, /* FreeCredentialsHandle */ - NULL, /* Reserved2 */ - kerberos_InitializeSecurityContextW, /* InitializeSecurityContextW */ - kerberos_AcceptSecurityContext, /* AcceptSecurityContext */ - kerberos_CompleteAuthToken, /* CompleteAuthToken */ - kerberos_DeleteSecurityContext, /* DeleteSecurityContext */ - NULL, /* ApplyControlToken */ - kerberos_QueryContextAttributesW, /* QueryContextAttributesW */ - kerberos_ImpersonateSecurityContext, /* ImpersonateSecurityContext */ - kerberos_RevertSecurityContext, /* RevertSecurityContext */ - kerberos_MakeSignature, /* MakeSignature */ - kerberos_VerifySignature, /* VerifySignature */ - FreeContextBuffer, /* FreeContextBuffer */ - NULL, /* QuerySecurityPackageInfoW */ - NULL, /* Reserved3 */ - NULL, /* Reserved4 */ - NULL, /* ExportSecurityContext */ - NULL, /* ImportSecurityContextW */ - NULL, /* AddCredentialsW */ - NULL, /* Reserved8 */ - NULL, /* QuerySecurityContextToken */ - kerberos_EncryptMessage, /* EncryptMessage */ - kerberos_DecryptMessage, /* DecryptMessage */ - NULL, /* SetContextAttributesW */ -}; - -#define KERBEROS_COMMENT \ - {'M','i','c','r','o','s','o','f','t',' ','K','e','r','b','e','r','o','s',' ','V','1','.','0',0} -static CHAR kerberos_comment_A[] = KERBEROS_COMMENT; -static WCHAR kerberos_comment_W[] = KERBEROS_COMMENT; - -#define KERBEROS_NAME {'K','e','r','b','e','r','o','s',0} -static char kerberos_name_A[] = KERBEROS_NAME; -static WCHAR kerberos_name_W[] = KERBEROS_NAME; - -#define CAPS \ - ( SECPKG_FLAG_INTEGRITY \ - | SECPKG_FLAG_PRIVACY \ - | SECPKG_FLAG_TOKEN_ONLY \ - | SECPKG_FLAG_DATAGRAM \ - | SECPKG_FLAG_CONNECTION \ - | SECPKG_FLAG_MULTI_REQUIRED \ - | SECPKG_FLAG_EXTENDED_ERROR \ - | SECPKG_FLAG_IMPERSONATION \ - | SECPKG_FLAG_ACCEPT_WIN32_NAME \ - | SECPKG_FLAG_NEGOTIABLE \ - | SECPKG_FLAG_GSS_COMPATIBLE \ - | SECPKG_FLAG_LOGON \ - | SECPKG_FLAG_MUTUAL_AUTH \ - | SECPKG_FLAG_DELEGATION \ - | SECPKG_FLAG_READONLY_WITH_CHECKSUM \ - | SECPKG_FLAG_RESTRICTED_TOKENS \ - | SECPKG_FLAG_APPCONTAINER_CHECKS) - -static const SecPkgInfoW infoW = { - CAPS, - 1, - RPC_C_AUTHN_GSS_KERBEROS, - KERBEROS_MAX_BUF, - kerberos_name_W, - kerberos_comment_W -}; - -static const SecPkgInfoA infoA = { - CAPS, - 1, - RPC_C_AUTHN_GSS_KERBEROS, - KERBEROS_MAX_BUF, - kerberos_name_A, - kerberos_comment_A -}; - -void SECUR32_initKerberosSP(void) -{ - SecureProvider *provider = SECUR32_addProvider(&kerberosTableA, &kerberosTableW, NULL); - SECUR32_addPackages(provider, 1, &infoA, &infoW); -} diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 1e12f3c543..f7b1ec2d98 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -564,7 +564,8 @@ static void SECUR32_initializeProviders(void) /* First load built-in providers */ SECUR32_initSchannelSP(); SECUR32_initNTLMSP(); - SECUR32_initKerberosSP(); + /* Load SSP/AP packages (Kerberos and others) */ + load_auth_packages(); /* Load the Negotiate provider last so apps stumble over the working NTLM * provider first. Attempting to fix bug #16905 while keeping the * application reported on wine-users on 2006-09-12 working. */ diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 9a60d65788..973b75c699 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -136,7 +136,7 @@ PSTR SECUR32_AllocMultiByteFromWide(PCWSTR str) DECLSPEC_HIDDEN; void SECUR32_initSchannelSP(void) DECLSPEC_HIDDEN; void SECUR32_initNegotiateSP(void) DECLSPEC_HIDDEN; void SECUR32_initNTLMSP(void) DECLSPEC_HIDDEN; -void SECUR32_initKerberosSP(void) DECLSPEC_HIDDEN; +void load_auth_packages(void) DECLSPEC_HIDDEN; /* Cleanup functions for built-in providers */ void SECUR32_deinitSchannelSP(void) DECLSPEC_HIDDEN; -- 2.15.1

2 1

[PATCH 11/13] secur32: Implement DecryptMessage in the SSP/AP wrapper.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 548aff4576..e8939a2d6e 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -643,6 +643,27 @@ static SECURITY_STATUS WINAPI lsa_EncryptMessage(CtxtHandle *context, ULONG qual return lsa_package->user_api->SealMessage(lsa_context, quality_of_protection, message, message_seq_no); } +static SECURITY_STATUS WINAPI lsa_DecryptMessage(CtxtHandle *context, SecBufferDesc *message, + ULONG message_seq_no, ULONG *quality_of_protection) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_context; + + TRACE("%p %p %u %p)\n", context, message, message_seq_no, quality_of_protection); + + 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->user_api->UnsealMessage) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->user_api->UnsealMessage(lsa_context, message, message_seq_no, quality_of_protection); +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -671,7 +692,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = NULL, /* Reserved8 */ NULL, /* QuerySecurityContextToken */ lsa_EncryptMessage, - NULL, /* DecryptMessage */ + lsa_DecryptMessage, NULL, /* SetContextAttributesW */ }; @@ -703,7 +724,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = NULL, /* Reserved8 */ NULL, /* QuerySecurityContextToken */ lsa_EncryptMessage, - NULL, /* DecryptMessage */ + lsa_DecryptMessage, NULL, /* SetContextAttributesA */ }; -- 2.15.1

2 1

[PATCH 10/13] secur32: Implement EncryptMessage in the SSP/AP wrapper.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 374f0b1010..548aff4576 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -622,6 +622,27 @@ static SECURITY_STATUS WINAPI lsa_VerifySignature(CtxtHandle *context, SecBuffer return lsa_package->user_api->VerifySignature(lsa_context, message, message_seq_no, quality_of_protection); } +static SECURITY_STATUS WINAPI lsa_EncryptMessage(CtxtHandle *context, ULONG quality_of_protection, + SecBufferDesc *message, ULONG message_seq_no) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_context; + + TRACE("%p %#x %p %u)\n", context, quality_of_protection, message, message_seq_no); + + 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->user_api->SealMessage) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->user_api->SealMessage(lsa_context, quality_of_protection, message, message_seq_no); +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -649,7 +670,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = NULL, /* AddCredentialsW */ NULL, /* Reserved8 */ NULL, /* QuerySecurityContextToken */ - NULL, /* EncryptMessage */ + lsa_EncryptMessage, NULL, /* DecryptMessage */ NULL, /* SetContextAttributesW */ }; @@ -681,7 +702,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = NULL, /* AddCredentialsA */ NULL, /* Reserved8 */ NULL, /* QuerySecurityContextToken */ - NULL, /* EncryptMessage */ + lsa_EncryptMessage, NULL, /* DecryptMessage */ NULL, /* SetContextAttributesA */ }; -- 2.15.1

2 1

[PATCH 09/13] secur32: Implement VerifySignature in the SSP/AP wrapper.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 4991e6ec32..374f0b1010 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -601,6 +601,27 @@ static SECURITY_STATUS WINAPI lsa_MakeSignature(CtxtHandle *context, ULONG quali return lsa_package->user_api->MakeSignature(lsa_context, quality_of_protection, message, message_seq_no); } +static SECURITY_STATUS WINAPI lsa_VerifySignature(CtxtHandle *context, SecBufferDesc *message, + ULONG message_seq_no, ULONG *quality_of_protection) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_context; + + TRACE("%p %p %u %p)\n", context, message, message_seq_no, quality_of_protection); + + 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->user_api->VerifySignature) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->user_api->VerifySignature(lsa_context, message, message_seq_no, quality_of_protection); +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -618,7 +639,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ lsa_MakeSignature, - NULL, /* VerifySignature */ + lsa_VerifySignature, NULL, /* FreeContextBuffer */ NULL, /* QuerySecurityPackageInfoW */ NULL, /* Reserved3 */ @@ -650,7 +671,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ lsa_MakeSignature, - NULL, /* VerifySignature */ + lsa_VerifySignature, NULL, /* FreeContextBuffer */ NULL, /* QuerySecurityPackageInfoA */ NULL, /* Reserved3 */ -- 2.15.1

2 1

[PATCH 08/13] secur32: Implement MakeSignature in the SSP/AP wrapper.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index c255bd2b96..4991e6ec32 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -580,6 +580,27 @@ static SECURITY_STATUS WINAPI lsa_QueryContextAttributesA(CtxtHandle *context, U return SEC_E_UNSUPPORTED_FUNCTION; } +static SECURITY_STATUS WINAPI lsa_MakeSignature(CtxtHandle *context, ULONG quality_of_protection, + SecBufferDesc *message, ULONG message_seq_no) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_context; + + TRACE("%p %#x %p %u)\n", context, quality_of_protection, message, message_seq_no); + + 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->user_api->MakeSignature) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->user_api->MakeSignature(lsa_context, quality_of_protection, message, message_seq_no); +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -596,7 +617,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = lsa_QueryContextAttributesW, NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ - NULL, /* MakeSignature */ + lsa_MakeSignature, NULL, /* VerifySignature */ NULL, /* FreeContextBuffer */ NULL, /* QuerySecurityPackageInfoW */ @@ -628,7 +649,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = lsa_QueryContextAttributesA, NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ - NULL, /* MakeSignature */ + lsa_MakeSignature, NULL, /* VerifySignature */ NULL, /* FreeContextBuffer */ NULL, /* QuerySecurityPackageInfoA */ -- 2.15.1

2 1

[PATCH 07/13] secur32: Implement QueryContextAttributes in the SSP/AP wrapper.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 09eff78bbe..c255bd2b96 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -526,6 +526,60 @@ static SECURITY_STATUS WINAPI lsa_DeleteSecurityContext(CtxtHandle *context) return lsa_package->lsa_api->DeleteContext(lsa_context); } +static SECURITY_STATUS WINAPI lsa_QueryContextAttributesW(CtxtHandle *context, ULONG attribute, void *buffer) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_context; + + TRACE("%p %d %p\n", context, attribute, buffer); + + 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->SpQueryContextAttributes) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->lsa_api->SpQueryContextAttributes(lsa_context, attribute, buffer); +} + +static SECURITY_STATUS WINAPI lsa_QueryContextAttributesA(CtxtHandle *context, ULONG attribute, void *buffer) +{ + TRACE("%p %d %p\n", context, attribute, buffer); + + if (!context) return SEC_E_INVALID_HANDLE; + + switch (attribute) + { + case SECPKG_ATTR_SIZES: + return lsa_QueryContextAttributesW( context, attribute, buffer ); + +#define X(x) case (x) : FIXME(#x" stub\n"); break + X(SECPKG_ATTR_ACCESS_TOKEN); + X(SECPKG_ATTR_AUTHORITY); + X(SECPKG_ATTR_DCE_INFO); + X(SECPKG_ATTR_KEY_INFO); + X(SECPKG_ATTR_LIFESPAN); + X(SECPKG_ATTR_NAMES); + 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); + X(SECPKG_ATTR_NEGOTIATION_INFO); +#undef X + default: + FIXME( "unknown attribute %u\n", attribute ); + break; + } + + return SEC_E_UNSUPPORTED_FUNCTION; +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -539,7 +593,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = NULL, /* CompleteAuthToken */ lsa_DeleteSecurityContext, NULL, /* ApplyControlToken */ - NULL, /* QueryContextAttributesW */ + lsa_QueryContextAttributesW, NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ NULL, /* MakeSignature */ @@ -571,7 +625,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = NULL, /* CompleteAuthToken */ lsa_DeleteSecurityContext, NULL, /* ApplyControlToken */ - NULL, /* QueryContextAttributesA */ + lsa_QueryContextAttributesA, NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ NULL, /* MakeSignature */ -- 2.15.1

2 1

← Newer
1
2
3
4
5
6
7
8
...
51
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-devel January 2018