mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libwinpr-sspi: improve attempted channel binding token computation

Browse Source
This commit is contained in:
Marc-André Moreau 2013-01-06 16:05:20 -05:00
parent 609459f8a6
commit 4cf0dc1004
3 changed files with 59 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
winpr/libwinpr/sspi/NTLM/ntlm_av_pairs.c
View File

@ -303,10 +303,29 @@ int test_CertificateHashLength = 32;
char TlsServerEndPointPrefix[] = "tls-server-end-point:";
void ntlm_uint32_to_big_endian(UINT32 num, BYTE be32[4])
{
be32[0] = (num >> 0) & 0xFF;
be32[1] = (num >> 8) & 0xFF;
be32[2] = (num >> 16) & 0xFF;
be32[3] = (num >> 24) & 0xFF;
}
/*
typedef struct gss_channel_bindings_struct {
OM_uint32 initiator_addrtype;
gss_buffer_desc initiator_address;
OM_uint32 acceptor_addrtype;
gss_buffer_desc acceptor_address;
gss_buffer_desc application_data;
} *gss_channel_bindings_t;
*/
void ntlm_compute_channel_bindings(NTLM_CONTEXT* context)
{
#if 0
MD5_CTX md5;
BYTE be32[4];
int HashLength;
int PrefixLength;
BYTE* pChannelBindingToken;
@ -340,11 +359,39 @@ void ntlm_compute_channel_bindings(NTLM_CONTEXT* context)
winpr_HexDump((BYTE*) ChannelBindings, context->EndpointBindings.BindingsLength);
MD5_Init(&md5);
MD5_Update(&md5, (void*) context->EndpointBindings.Bindings, context->EndpointBindings.BindingsLength);
ntlm_uint32_to_big_endian(ChannelBindings->dwInitiatorAddrType, be32);
MD5_Update(&md5, be32, 4);
ntlm_uint32_to_big_endian(ChannelBindings->cbInitiatorLength, be32);
MD5_Update(&md5, be32, 4);
//ntlm_uint32_to_big_endian(ChannelBindings->dwInitiatorOffset, be32);
//MD5_Update(&md5, be32, 4);
ntlm_uint32_to_big_endian(ChannelBindings->dwAcceptorAddrType, be32);
MD5_Update(&md5, be32, 4);
ntlm_uint32_to_big_endian(ChannelBindings->cbAcceptorLength, be32);
MD5_Update(&md5, be32, 4);
//ntlm_uint32_to_big_endian(ChannelBindings->dwAcceptorOffset, be32);
//MD5_Update(&md5, be32, 4);
ntlm_uint32_to_big_endian(ChannelBindings->cbApplicationDataLength, be32);
MD5_Update(&md5, be32, 4);
//ntlm_uint32_to_big_endian(ChannelBindings->dwApplicationDataOffset, be32);
//MD5_Update(&md5, be32, 4);
MD5_Update(&md5, (void*) pChannelBindingToken, ChannelBindingTokenLength);
MD5_Final(context->ChannelBindingsHash, &md5);
printf("ChannelBindingsHash:\n");
winpr_HexDump(context->ChannelBindingsHash, 16);
printf("\n\n");
#endif
}

3
winpr/libwinpr/sspi/test/CMakeLists.txt
View File

@ -9,7 +9,8 @@ set(${MODULE_PREFIX}_TESTS
TestEnumerateSecurityPackages.c
TestInitializeSecurityContext.c
TestAcquireCredentialsHandle.c
TestSchannel.c)
TestSchannel.c
TestNTLM.c)
create_test_sourcelist(${MODULE_PREFIX}_SRCS
${${MODULE_PREFIX}_DRIVER}

9
winpr/libwinpr/sspi/test/TestNTLM.c Normal file
View File

@ -0,0 +1,9 @@
#include <winpr/crt.h>
#include <winpr/sspi.h>
int TestNTLM(int argc, char* argv[])
{
return 0;
}