From 40357d2c313d9c4568f8d247155559a0751104e1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marc-Andr=C3=A9=20Moreau?= Date: Thu, 15 Mar 2012 20:48:38 -0400 Subject: [PATCH] libfreerdp-sspi: fix unit tests --- cunit/test_sspi.c | 54 +++++++++++++++++------------------ include/freerdp/sspi/sspi.h | 4 +-- libfreerdp-sspi/Kerberos/kerberos.c | 2 +- libfreerdp-sspi/NTLM/ntlm.c | 2 +- libfreerdp-sspi/Negotiate/negotiate.c | 2 +- 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/cunit/test_sspi.c b/cunit/test_sspi.c index a7b4132..e176c8e 100644 --- a/cunit/test_sspi.c +++ b/cunit/test_sspi.c @@ -55,7 +55,7 @@ void test_EnumerateSecurityPackages(void) { uint32 cPackages; SECURITY_STATUS status; - SEC_PKG_INFO* pPackageInfo; + SecPkgInfo* pPackageInfo; status = EnumerateSecurityPackages(&cPackages, &pPackageInfo); @@ -78,7 +78,7 @@ void test_EnumerateSecurityPackages(void) void test_QuerySecurityPackageInfo(void) { SECURITY_STATUS status; - SEC_PKG_INFO* pPackageInfo; + SecPkgInfo* pPackageInfo; status = QuerySecurityPackageInfo("NTLM", &pPackageInfo); @@ -96,11 +96,11 @@ const char* test_Password = "Password"; void test_AcquireCredentialsHandle(void) { SECURITY_STATUS status; - CRED_HANDLE credentials; + CredHandle credentials; SEC_TIMESTAMP expiration; - SEC_AUTH_IDENTITY identity; - SECURITY_FUNCTION_TABLE* table; - SEC_PKG_CREDENTIALS_NAMES credential_names; + SEC_WINNT_AUTH_IDENTITY identity; + SecurityFunctionTable* table; + SecPkgCredentials_Names credential_names; table = InitSecurityInterface(); @@ -110,7 +110,7 @@ void test_AcquireCredentialsHandle(void) identity.DomainLength = sizeof(test_Domain); identity.Password = (uint16*) xstrdup(test_Password); identity.PasswordLength = sizeof(test_Password); - identity.Flags = SEC_AUTH_IDENTITY_ANSI; + identity.Flags = SEC_WINNT_AUTH_IDENTITY_ANSI; status = table->AcquireCredentialsHandle(NULL, NTLM_PACKAGE_NAME, SECPKG_CRED_OUTBOUND, NULL, &identity, NULL, NULL, &credentials, &expiration); @@ -131,17 +131,17 @@ void test_InitializeSecurityContext(void) uint32 cbMaxLen; uint32 fContextReq; void* output_buffer; - CTXT_HANDLE context; + CtxtHandle context; uint32 pfContextAttr; SECURITY_STATUS status; - CRED_HANDLE credentials; + CredHandle credentials; SEC_TIMESTAMP expiration; - SEC_PKG_INFO* pPackageInfo; - SEC_AUTH_IDENTITY identity; - SECURITY_FUNCTION_TABLE* table; - SEC_BUFFER* p_sec_buffer; - SEC_BUFFER output_sec_buffer; - SEC_BUFFER_DESC output_sec_buffer_desc; + SecPkgInfo* pPackageInfo; + SEC_WINNT_AUTH_IDENTITY identity; + SecurityFunctionTable* table; + SecBuffer* p_SecBuffer; + SecBuffer output_SecBuffer; + SecBufferDesc output_SecBuffer_desc; table = InitSecurityInterface(); @@ -161,7 +161,7 @@ void test_InitializeSecurityContext(void) identity.DomainLength = sizeof(test_Domain); identity.Password = (uint16*) xstrdup(test_Password); identity.PasswordLength = sizeof(test_Password); - identity.Flags = SEC_AUTH_IDENTITY_ANSI; + identity.Flags = SEC_WINNT_AUTH_IDENTITY_ANSI; status = table->AcquireCredentialsHandle(NULL, NTLM_PACKAGE_NAME, SECPKG_CRED_OUTBOUND, NULL, &identity, NULL, NULL, &credentials, &expiration); @@ -176,16 +176,16 @@ void test_InitializeSecurityContext(void) output_buffer = xmalloc(cbMaxLen); - output_sec_buffer_desc.ulVersion = 0; - output_sec_buffer_desc.cBuffers = 1; - output_sec_buffer_desc.pBuffers = &output_sec_buffer; + output_SecBuffer_desc.ulVersion = 0; + output_SecBuffer_desc.cBuffers = 1; + output_SecBuffer_desc.pBuffers = &output_SecBuffer; - output_sec_buffer.cbBuffer = cbMaxLen; - output_sec_buffer.BufferType = SECBUFFER_TOKEN; - output_sec_buffer.pvBuffer = output_buffer; + output_SecBuffer.cbBuffer = cbMaxLen; + output_SecBuffer.BufferType = SECBUFFER_TOKEN; + output_SecBuffer.pvBuffer = output_buffer; status = table->InitializeSecurityContext(&credentials, NULL, NULL, fContextReq, 0, 0, NULL, 0, - &context, &output_sec_buffer_desc, &pfContextAttr, &expiration); + &context, &output_SecBuffer_desc, &pfContextAttr, &expiration); if (status != SEC_I_CONTINUE_NEEDED) { @@ -193,13 +193,13 @@ void test_InitializeSecurityContext(void) return; } - printf("cBuffers: %d ulVersion: %d\n", output_sec_buffer_desc.cBuffers, output_sec_buffer_desc.ulVersion); + printf("cBuffers: %d ulVersion: %d\n", output_SecBuffer_desc.cBuffers, output_SecBuffer_desc.ulVersion); - p_sec_buffer = &output_sec_buffer_desc.pBuffers[0]; + p_SecBuffer = &output_SecBuffer_desc.pBuffers[0]; - printf("BufferType: 0x%04X cbBuffer:%d\n", p_sec_buffer->BufferType, p_sec_buffer->cbBuffer); + printf("BufferType: 0x%04X cbBuffer:%d\n", p_SecBuffer->BufferType, p_SecBuffer->cbBuffer); - freerdp_hexdump((uint8*) p_sec_buffer->pvBuffer, p_sec_buffer->cbBuffer); + freerdp_hexdump((uint8*) p_SecBuffer->pvBuffer, p_SecBuffer->cbBuffer); table->FreeCredentialsHandle(&credentials); diff --git a/include/freerdp/sspi/sspi.h b/include/freerdp/sspi/sspi.h index f5836e6..de433b6 100644 --- a/include/freerdp/sspi/sspi.h +++ b/include/freerdp/sspi/sspi.h @@ -409,11 +409,11 @@ typedef struct _SecPkgContext_TargetInformation SecPkgContext_TargetInformation; #define SECPKG_CRED_ATTR_NAMES 1 -struct _SEC_PKG_CREDENTIALS_NAMES +struct _SecPkgCredentials_Names { char* sUserName; }; -typedef struct _SEC_PKG_CREDENTIALS_NAMES SEC_PKG_CREDENTIALS_NAMES; +typedef struct _SecPkgCredentials_Names SecPkgCredentials_Names; /* InitializeSecurityContext Flags */ diff --git a/libfreerdp-sspi/Kerberos/kerberos.c b/libfreerdp-sspi/Kerberos/kerberos.c index 27d6b84..1f1be8c 100644 --- a/libfreerdp-sspi/Kerberos/kerberos.c +++ b/libfreerdp-sspi/Kerberos/kerberos.c @@ -320,7 +320,7 @@ SECURITY_STATUS krb_QueryCredentialsAttributes(CredHandle* phCredential, uint32 if (ulAttribute == SECPKG_CRED_ATTR_NAMES) { CREDENTIALS* credentials; - SEC_PKG_CREDENTIALS_NAMES* credential_names = (SEC_PKG_CREDENTIALS_NAMES*) pBuffer; + SecPkgCredentials_Names* credential_names = (SecPkgCredentials_Names*) pBuffer; credentials = (CREDENTIALS*) sspi_SecureHandleGetLowerPointer(phCredential); diff --git a/libfreerdp-sspi/NTLM/ntlm.c b/libfreerdp-sspi/NTLM/ntlm.c index 80acd9a..04fc607 100644 --- a/libfreerdp-sspi/NTLM/ntlm.c +++ b/libfreerdp-sspi/NTLM/ntlm.c @@ -166,7 +166,7 @@ SECURITY_STATUS ntlm_QueryCredentialsAttributes(CredHandle* phCredential, uint32 if (ulAttribute == SECPKG_CRED_ATTR_NAMES) { CREDENTIALS* credentials; - SEC_PKG_CREDENTIALS_NAMES* credential_names = (SEC_PKG_CREDENTIALS_NAMES*) pBuffer; + SecPkgCredentials_Names* credential_names = (SecPkgCredentials_Names*) pBuffer; credentials = (CREDENTIALS*) sspi_SecureHandleGetLowerPointer(phCredential); diff --git a/libfreerdp-sspi/Negotiate/negotiate.c b/libfreerdp-sspi/Negotiate/negotiate.c index 053e09f..40abb8a 100644 --- a/libfreerdp-sspi/Negotiate/negotiate.c +++ b/libfreerdp-sspi/Negotiate/negotiate.c @@ -199,7 +199,7 @@ SECURITY_STATUS negotiate_QueryCredentialsAttributes(CredHandle* phCredential, u if (ulAttribute == SECPKG_CRED_ATTR_NAMES) { CREDENTIALS* credentials; - SEC_PKG_CREDENTIALS_NAMES* credential_names = (SEC_PKG_CREDENTIALS_NAMES*) pBuffer; + SecPkgCredentials_Names* credential_names = (SecPkgCredentials_Names*) pBuffer; credentials = (CREDENTIALS*) sspi_SecureHandleGetLowerPointer(phCredential); -- 2.7.4