diff --git a/winpr/libwinpr/sspi/NTLM/ntlm_av_pairs.c b/winpr/libwinpr/sspi/NTLM/ntlm_av_pairs.c index fa9fbe5ec..8665dc0db 100644 --- a/winpr/libwinpr/sspi/NTLM/ntlm_av_pairs.c +++ b/winpr/libwinpr/sspi/NTLM/ntlm_av_pairs.c @@ -152,6 +152,7 @@ static INLINE BOOL ntlm_av_pair_get_len(const NTLM_AV_PAIR* pAvPair, size_t size return TRUE; } +#ifdef WITH_DEBUG_NTLM void ntlm_print_av_pair_list(NTLM_AV_PAIR* pAvPairList, size_t cbAvPairList) { UINT16 pair; @@ -161,19 +162,20 @@ void ntlm_print_av_pair_list(NTLM_AV_PAIR* pAvPairList, size_t cbAvPairList) if (!ntlm_av_pair_check(pAvPair, cbAvPair)) return; - WLog_INFO(TAG, "AV_PAIRs ="); + WLog_VRB(TAG, "AV_PAIRs ="); while (pAvPair && ntlm_av_pair_get_id(pAvPair, cbAvPair, &pair) && (pair != MsvAvEOL)) { size_t cbLen = 0; ntlm_av_pair_get_len(pAvPair, cbAvPair, &cbLen); - WLog_INFO(TAG, "\t%s AvId: %" PRIu16 " AvLen: %" PRIu16 "", get_av_pair_string(pair), pair); - winpr_HexDump(TAG, WLOG_INFO, ntlm_av_pair_get_value_pointer(pAvPair), cbLen); + WLog_VRB(TAG, "\t%s AvId: %" PRIu16 " AvLen: %" PRIu16 "", get_av_pair_string(pair), pair); + winpr_HexDump(TAG, WLOG_TRACE, ntlm_av_pair_get_value_pointer(pAvPair), cbLen); pAvPair = ntlm_av_pair_next(pAvPair, &cbAvPair); } } +#endif static ULONG ntlm_av_pair_list_size(ULONG AvPairsCount, ULONG AvPairsValueLength) { diff --git a/winpr/libwinpr/sspi/NTLM/ntlm_av_pairs.h b/winpr/libwinpr/sspi/NTLM/ntlm_av_pairs.h index ac228a869..0b57ca863 100644 --- a/winpr/libwinpr/sspi/NTLM/ntlm_av_pairs.h +++ b/winpr/libwinpr/sspi/NTLM/ntlm_av_pairs.h @@ -20,12 +20,20 @@ #ifndef WINPR_SSPI_NTLM_AV_PAIRS_H #define WINPR_SSPI_NTLM_AV_PAIRS_H +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "ntlm.h" #include ULONG ntlm_av_pair_list_length(NTLM_AV_PAIR* pAvPairList, size_t cbAvPairList); + +#ifdef WITH_DEBUG_NTLM void ntlm_print_av_pair_list(NTLM_AV_PAIR* pAvPairList, size_t cbAvPairList); +#endif + PBYTE ntlm_av_pair_get_value_pointer(NTLM_AV_PAIR* pAvPair); NTLM_AV_PAIR* ntlm_av_pair_get(NTLM_AV_PAIR* pAvPairList, size_t cbAvPairList, NTLM_AV_ID AvId, size_t* pcbAvPairListRemaining); diff --git a/winpr/libwinpr/sspi/NTLM/ntlm_compute.c b/winpr/libwinpr/sspi/NTLM/ntlm_compute.c index 4e77b8ef6..14a03d093 100644 --- a/winpr/libwinpr/sspi/NTLM/ntlm_compute.c +++ b/winpr/libwinpr/sspi/NTLM/ntlm_compute.c @@ -103,17 +103,18 @@ void ntlm_write_version_info(wStream* s, NTLM_VERSION_INFO* versionInfo) * VERSION @msdn{cc236654} * @param s */ - +#ifdef WITH_DEBUG_NTLM void ntlm_print_version_info(NTLM_VERSION_INFO* versionInfo) { - WLog_INFO(TAG, "VERSION ={"); - WLog_INFO(TAG, "\tProductMajorVersion: %" PRIu8 "", versionInfo->ProductMajorVersion); - WLog_INFO(TAG, "\tProductMinorVersion: %" PRIu8 "", versionInfo->ProductMinorVersion); - WLog_INFO(TAG, "\tProductBuild: %" PRIu16 "", versionInfo->ProductBuild); - WLog_INFO(TAG, "\tReserved: 0x%02" PRIX8 "%02" PRIX8 "%02" PRIX8 "", versionInfo->Reserved[0], - versionInfo->Reserved[1], versionInfo->Reserved[2]); - WLog_INFO(TAG, "\tNTLMRevisionCurrent: 0x%02" PRIX8 "", versionInfo->NTLMRevisionCurrent); + WLog_VRB(TAG, "VERSION ={"); + WLog_VRB(TAG, "\tProductMajorVersion: %" PRIu8 "", versionInfo->ProductMajorVersion); + WLog_VRB(TAG, "\tProductMinorVersion: %" PRIu8 "", versionInfo->ProductMinorVersion); + WLog_VRB(TAG, "\tProductBuild: %" PRIu16 "", versionInfo->ProductBuild); + WLog_VRB(TAG, "\tReserved: 0x%02" PRIX8 "%02" PRIX8 "%02" PRIX8 "", versionInfo->Reserved[0], + versionInfo->Reserved[1], versionInfo->Reserved[2]); + WLog_VRB(TAG, "\tNTLMRevisionCurrent: 0x%02" PRIX8 "", versionInfo->NTLMRevisionCurrent); } +#endif static int ntlm_read_ntlm_v2_client_challenge(wStream* s, NTLMv2_CLIENT_CHALLENGE* challenge) { @@ -217,7 +218,7 @@ static int ntlm_fetch_ntlm_v2_hash(NTLM_CONTEXT* context, BYTE* hash) if (entry) { #ifdef WITH_DEBUG_NTLM - WLog_DBG(TAG, "NTLM Hash:"); + WLog_VRB(TAG, "NTLM Hash:"); winpr_HexDump(TAG, WLOG_DEBUG, entry->NtHash, 16); #endif NTOWFv2FromHashW(entry->NtHash, (LPWSTR)credentials->identity.User, @@ -234,7 +235,7 @@ static int ntlm_fetch_ntlm_v2_hash(NTLM_CONTEXT* context, BYTE* hash) if (entry) { #ifdef WITH_DEBUG_NTLM - WLog_DBG(TAG, "NTLM Hash:"); + WLog_VRB(TAG, "NTLM Hash:"); winpr_HexDump(TAG, WLOG_DEBUG, entry->NtHash, 16); #endif NTOWFv2FromHashW(entry->NtHash, (LPWSTR)credentials->identity.User, @@ -292,23 +293,23 @@ static int ntlm_compute_ntlm_v2_hash(NTLM_CONTEXT* context, BYTE* hash) if (credentials) { - WLog_DBG(TAG, "Password (length = %" PRIu32 ")", credentials->identity.PasswordLength * 2); - winpr_HexDump(TAG, WLOG_DEBUG, (BYTE*)credentials->identity.Password, + WLog_VRB(TAG, "Password (length = %" PRIu32 ")", credentials->identity.PasswordLength * 2); + winpr_HexDump(TAG, WLOG_TRACE, (BYTE*)credentials->identity.Password, credentials->identity.PasswordLength * 2); - WLog_DBG(TAG, "Username (length = %" PRIu32 ")", credentials->identity.UserLength * 2); - winpr_HexDump(TAG, WLOG_DEBUG, (BYTE*)credentials->identity.User, + WLog_VRB(TAG, "Username (length = %" PRIu32 ")", credentials->identity.UserLength * 2); + winpr_HexDump(TAG, WLOG_TRACE, (BYTE*)credentials->identity.User, credentials->identity.UserLength * 2); - WLog_DBG(TAG, "Domain (length = %" PRIu32 ")", credentials->identity.DomainLength * 2); - winpr_HexDump(TAG, WLOG_DEBUG, (BYTE*)credentials->identity.Domain, + WLog_VRB(TAG, "Domain (length = %" PRIu32 ")", credentials->identity.DomainLength * 2); + winpr_HexDump(TAG, WLOG_TRACE, (BYTE*)credentials->identity.Domain, credentials->identity.DomainLength * 2); } else - WLog_DBG(TAG, "Strange, NTLM_CONTEXT is missing valid credentials..."); + WLog_VRB(TAG, "Strange, NTLM_CONTEXT is missing valid credentials..."); - WLog_DBG(TAG, "Workstation (length = %" PRIu16 ")", context->Workstation.Length); - winpr_HexDump(TAG, WLOG_DEBUG, (BYTE*)context->Workstation.Buffer, context->Workstation.Length); - WLog_DBG(TAG, "NTOWFv2, NTLMv2 Hash"); - winpr_HexDump(TAG, WLOG_DEBUG, context->NtlmV2Hash, WINPR_MD5_DIGEST_LENGTH); + WLog_VRB(TAG, "Workstation (length = %" PRIu16 ")", context->Workstation.Length); + winpr_HexDump(TAG, WLOG_TRACE, (BYTE*)context->Workstation.Buffer, context->Workstation.Length); + WLog_VRB(TAG, "NTOWFv2, NTLMv2 Hash"); + winpr_HexDump(TAG, WLOG_TRACE, context->NtlmV2Hash, WINPR_MD5_DIGEST_LENGTH); #endif if (memcmp(context->NtlmV2Hash, NTLM_NULL_BUFFER, 16) != 0) @@ -440,8 +441,8 @@ int ntlm_compute_ntlm_v2_response(NTLM_CONTEXT* context) /* Reserved3 (4 bytes) */ CopyMemory(&blob[28], TargetInfo->pvBuffer, TargetInfo->cbBuffer); #ifdef WITH_DEBUG_NTLM - WLog_DBG(TAG, "NTLMv2 Response Temp Blob"); - winpr_HexDump(TAG, WLOG_DEBUG, ntlm_v2_temp.pvBuffer, ntlm_v2_temp.cbBuffer); + WLog_VRB(TAG, "NTLMv2 Response Temp Blob"); + winpr_HexDump(TAG, WLOG_TRACE, ntlm_v2_temp.pvBuffer, ntlm_v2_temp.cbBuffer); #endif /* Concatenate server challenge with temp */ diff --git a/winpr/libwinpr/sspi/NTLM/ntlm_compute.h b/winpr/libwinpr/sspi/NTLM/ntlm_compute.h index 4df3ae64d..6bcbaa9ee 100644 --- a/winpr/libwinpr/sspi/NTLM/ntlm_compute.h +++ b/winpr/libwinpr/sspi/NTLM/ntlm_compute.h @@ -27,7 +27,10 @@ void ntlm_get_version_info(NTLM_VERSION_INFO* versionInfo); int ntlm_read_version_info(wStream* s, NTLM_VERSION_INFO* versionInfo); void ntlm_write_version_info(wStream* s, NTLM_VERSION_INFO* versionInfo); + +#ifdef WITH_DEBUG_NTLM void ntlm_print_version_info(NTLM_VERSION_INFO* versionInfo); +#endif int ntlm_read_ntlm_v2_response(wStream* s, NTLMv2_RESPONSE* response); int ntlm_write_ntlm_v2_response(wStream* s, NTLMv2_RESPONSE* response); diff --git a/winpr/libwinpr/sspi/NTLM/ntlm_message.c b/winpr/libwinpr/sspi/NTLM/ntlm_message.c index c6c20f240..bbee5b49d 100644 --- a/winpr/libwinpr/sspi/NTLM/ntlm_message.c +++ b/winpr/libwinpr/sspi/NTLM/ntlm_message.c @@ -76,14 +76,14 @@ static void ntlm_print_negotiate_flags(UINT32 flags) { int i; const char* str; - WLog_INFO(TAG, "negotiateFlags \"0x%08" PRIX32 "\"", flags); + WLog_VRB(TAG, "negotiateFlags \"0x%08" PRIX32 "\"", flags); for (i = 31; i >= 0; i--) { if ((flags >> i) & 1) { str = NTLM_NEGOTIATE_STRINGS[(31 - i)]; - WLog_INFO(TAG, "\t%s (%d),", str, (31 - i)); + WLog_VRB(TAG, "\t%s (%d),", str, (31 - i)); } } } @@ -187,11 +187,11 @@ static void ntlm_free_message_fields_buffer(NTLM_MESSAGE_FIELDS* fields) #ifdef WITH_DEBUG_NTLM static void ntlm_print_message_fields(NTLM_MESSAGE_FIELDS* fields, const char* name) { - WLog_DBG(TAG, "%s (Len: %" PRIu16 " MaxLen: %" PRIu16 " BufferOffset: %" PRIu32 ")", name, + WLog_VRB(TAG, "%s (Len: %" PRIu16 " MaxLen: %" PRIu16 " BufferOffset: %" PRIu32 ")", name, fields->Len, fields->MaxLen, fields->BufferOffset); if (fields->Len > 0) - winpr_HexDump(TAG, WLOG_DEBUG, fields->Buffer, fields->Len); + winpr_HexDump(TAG, WLOG_TRACE, fields->Buffer, fields->Len); } #endif @@ -274,8 +274,8 @@ SECURITY_STATUS ntlm_read_NegotiateMessage(NTLM_CONTEXT* context, PSecBuffer buf CopyMemory(context->NegotiateMessage.pvBuffer, buffer->pvBuffer, buffer->cbBuffer); context->NegotiateMessage.BufferType = buffer->BufferType; #ifdef WITH_DEBUG_NTLM - WLog_DBG(TAG, "NEGOTIATE_MESSAGE (length = %" PRIu32 ")", context->NegotiateMessage.cbBuffer); - winpr_HexDump(TAG, WLOG_DEBUG, context->NegotiateMessage.pvBuffer, + WLog_VRB(TAG, "NEGOTIATE_MESSAGE (length = %" PRIu32 ")", context->NegotiateMessage.cbBuffer); + winpr_HexDump(TAG, WLOG_TRACE, context->NegotiateMessage.pvBuffer, context->NegotiateMessage.cbBuffer); ntlm_print_negotiate_flags(message->NegotiateFlags); @@ -355,8 +355,8 @@ SECURITY_STATUS ntlm_write_NegotiateMessage(NTLM_CONTEXT* context, PSecBuffer bu CopyMemory(context->NegotiateMessage.pvBuffer, buffer->pvBuffer, buffer->cbBuffer); context->NegotiateMessage.BufferType = buffer->BufferType; #ifdef WITH_DEBUG_NTLM - WLog_DBG(TAG, "NEGOTIATE_MESSAGE (length = %d)", length); - winpr_HexDump(TAG, WLOG_DEBUG, Stream_Buffer(s), length); + WLog_VRB(TAG, "NEGOTIATE_MESSAGE (length = %d)", length); + winpr_HexDump(TAG, WLOG_TRACE, Stream_Buffer(s), length); if (message->NegotiateFlags & NTLMSSP_NEGOTIATE_VERSION) ntlm_print_version_info(&(message->Version)); @@ -470,8 +470,8 @@ SECURITY_STATUS ntlm_read_ChallengeMessage(NTLM_CONTEXT* context, PSecBuffer buf if (context->ChallengeMessage.pvBuffer) CopyMemory(context->ChallengeMessage.pvBuffer, Stream_Buffer(s) + StartOffset, length); #ifdef WITH_DEBUG_NTLM - WLog_DBG(TAG, "CHALLENGE_MESSAGE (length = %d)", length); - winpr_HexDump(TAG, WLOG_DEBUG, context->ChallengeMessage.pvBuffer, + WLog_VRB(TAG, "CHALLENGE_MESSAGE (length = %d)", length); + winpr_HexDump(TAG, WLOG_TRACE, context->ChallengeMessage.pvBuffer, context->ChallengeMessage.cbBuffer); ntlm_print_negotiate_flags(context->NegotiateFlags); @@ -483,7 +483,7 @@ SECURITY_STATUS ntlm_read_ChallengeMessage(NTLM_CONTEXT* context, PSecBuffer buf if (context->ChallengeTargetInfo.cbBuffer > 0) { - WLog_DBG(TAG, "ChallengeTargetInfo (%" PRIu32 "):", context->ChallengeTargetInfo.cbBuffer); + WLog_VRB(TAG, "ChallengeTargetInfo (%" PRIu32 "):", context->ChallengeTargetInfo.cbBuffer); ntlm_print_av_pair_list(context->ChallengeTargetInfo.pvBuffer, context->ChallengeTargetInfo.cbBuffer); } @@ -522,28 +522,28 @@ SECURITY_STATUS ntlm_read_ChallengeMessage(NTLM_CONTEXT* context, PSecBuffer buf /* Initialize RC4 seal state using client sealing key */ ntlm_init_rc4_seal_states(context); #ifdef WITH_DEBUG_NTLM - WLog_DBG(TAG, "ClientChallenge"); - winpr_HexDump(TAG, WLOG_DEBUG, context->ClientChallenge, 8); - WLog_DBG(TAG, "ServerChallenge"); - winpr_HexDump(TAG, WLOG_DEBUG, context->ServerChallenge, 8); - WLog_DBG(TAG, "SessionBaseKey"); - winpr_HexDump(TAG, WLOG_DEBUG, context->SessionBaseKey, 16); - WLog_DBG(TAG, "KeyExchangeKey"); - winpr_HexDump(TAG, WLOG_DEBUG, context->KeyExchangeKey, 16); - WLog_DBG(TAG, "ExportedSessionKey"); - winpr_HexDump(TAG, WLOG_DEBUG, context->ExportedSessionKey, 16); - WLog_DBG(TAG, "RandomSessionKey"); - winpr_HexDump(TAG, WLOG_DEBUG, context->RandomSessionKey, 16); - WLog_DBG(TAG, "ClientSigningKey"); - winpr_HexDump(TAG, WLOG_DEBUG, context->ClientSigningKey, 16); - WLog_DBG(TAG, "ClientSealingKey"); - winpr_HexDump(TAG, WLOG_DEBUG, context->ClientSealingKey, 16); - WLog_DBG(TAG, "ServerSigningKey"); - winpr_HexDump(TAG, WLOG_DEBUG, context->ServerSigningKey, 16); - WLog_DBG(TAG, "ServerSealingKey"); - winpr_HexDump(TAG, WLOG_DEBUG, context->ServerSealingKey, 16); - WLog_DBG(TAG, "Timestamp"); - winpr_HexDump(TAG, WLOG_DEBUG, context->Timestamp, 8); + WLog_VRB(TAG, "ClientChallenge"); + winpr_HexDump(TAG, WLOG_TRACE, context->ClientChallenge, 8); + WLog_VRB(TAG, "ServerChallenge"); + winpr_HexDump(TAG, WLOG_TRACE, context->ServerChallenge, 8); + WLog_VRB(TAG, "SessionBaseKey"); + winpr_HexDump(TAG, WLOG_TRACE, context->SessionBaseKey, 16); + WLog_VRB(TAG, "KeyExchangeKey"); + winpr_HexDump(TAG, WLOG_TRACE, context->KeyExchangeKey, 16); + WLog_VRB(TAG, "ExportedSessionKey"); + winpr_HexDump(TAG, WLOG_TRACE, context->ExportedSessionKey, 16); + WLog_VRB(TAG, "RandomSessionKey"); + winpr_HexDump(TAG, WLOG_TRACE, context->RandomSessionKey, 16); + WLog_VRB(TAG, "ClientSigningKey"); + winpr_HexDump(TAG, WLOG_TRACE, context->ClientSigningKey, 16); + WLog_VRB(TAG, "ClientSealingKey"); + winpr_HexDump(TAG, WLOG_TRACE, context->ClientSealingKey, 16); + WLog_VRB(TAG, "ServerSigningKey"); + winpr_HexDump(TAG, WLOG_TRACE, context->ServerSigningKey, 16); + WLog_VRB(TAG, "ServerSealingKey"); + winpr_HexDump(TAG, WLOG_TRACE, context->ServerSealingKey, 16); + WLog_VRB(TAG, "Timestamp"); + winpr_HexDump(TAG, WLOG_TRACE, context->Timestamp, 8); #endif context->state = NTLM_STATE_AUTHENTICATE; status = SEC_I_CONTINUE_NEEDED; @@ -634,8 +634,8 @@ SECURITY_STATUS ntlm_write_ChallengeMessage(NTLM_CONTEXT* context, PSecBuffer bu CopyMemory(context->ChallengeMessage.pvBuffer, Stream_Buffer(s), length); #ifdef WITH_DEBUG_NTLM - WLog_DBG(TAG, "CHALLENGE_MESSAGE (length = %d)", length); - winpr_HexDump(TAG, WLOG_DEBUG, context->ChallengeMessage.pvBuffer, + WLog_VRB(TAG, "CHALLENGE_MESSAGE (length = %d)", length); + winpr_HexDump(TAG, WLOG_TRACE, context->ChallengeMessage.pvBuffer, context->ChallengeMessage.cbBuffer); ntlm_print_negotiate_flags(message->NegotiateFlags); @@ -799,9 +799,9 @@ SECURITY_STATUS ntlm_read_AuthenticateMessage(NTLM_CONTEXT* context, PSecBuffer status = SEC_E_INTERNAL_ERROR; #ifdef WITH_DEBUG_NTLM - WLog_DBG(TAG, "AUTHENTICATE_MESSAGE (length = %" PRIu32 ")", + WLog_VRB(TAG, "AUTHENTICATE_MESSAGE (length = %" PRIu32 ")", context->AuthenticateMessage.cbBuffer); - winpr_HexDump(TAG, WLOG_DEBUG, context->AuthenticateMessage.pvBuffer, + winpr_HexDump(TAG, WLOG_TRACE, context->AuthenticateMessage.pvBuffer, context->AuthenticateMessage.cbBuffer); if (message->NegotiateFlags & NTLMSSP_NEGOTIATE_VERSION) @@ -818,8 +818,8 @@ SECURITY_STATUS ntlm_read_AuthenticateMessage(NTLM_CONTEXT* context, PSecBuffer if (flags & MSV_AV_FLAGS_MESSAGE_INTEGRITY_CHECK) { - WLog_DBG(TAG, "MessageIntegrityCheck:"); - winpr_HexDump(TAG, WLOG_DEBUG, message->MessageIntegrityCheck, 16); + WLog_VRB(TAG, "MessageIntegrityCheck:"); + winpr_HexDump(TAG, WLOG_TRACE, message->MessageIntegrityCheck, 16); } #endif @@ -1011,8 +1011,8 @@ SECURITY_STATUS ntlm_write_AuthenticateMessage(NTLM_CONTEXT* context, PSecBuffer } #ifdef WITH_DEBUG_NTLM - WLog_DBG(TAG, "AUTHENTICATE_MESSAGE (length = %d)", length); - winpr_HexDump(TAG, WLOG_DEBUG, Stream_Buffer(s), length); + WLog_VRB(TAG, "AUTHENTICATE_MESSAGE (length = %d)", length); + winpr_HexDump(TAG, WLOG_TRACE, Stream_Buffer(s), length); ntlm_print_negotiate_flags(message->NegotiateFlags); if (message->NegotiateFlags & NTLMSSP_NEGOTIATE_VERSION) @@ -1020,7 +1020,7 @@ SECURITY_STATUS ntlm_write_AuthenticateMessage(NTLM_CONTEXT* context, PSecBuffer if (context->AuthenticateTargetInfo.cbBuffer > 0) { - WLog_DBG(TAG, + WLog_VRB(TAG, "AuthenticateTargetInfo (%" PRIu32 "):", context->AuthenticateTargetInfo.cbBuffer); ntlm_print_av_pair_list(context->AuthenticateTargetInfo.pvBuffer, context->AuthenticateTargetInfo.cbBuffer); @@ -1035,8 +1035,8 @@ SECURITY_STATUS ntlm_write_AuthenticateMessage(NTLM_CONTEXT* context, PSecBuffer if (context->UseMIC) { - WLog_DBG(TAG, "MessageIntegrityCheck (length = 16)"); - winpr_HexDump(TAG, WLOG_DEBUG, message->MessageIntegrityCheck, 16); + WLog_VRB(TAG, "MessageIntegrityCheck (length = 16)"); + winpr_HexDump(TAG, WLOG_TRACE, message->MessageIntegrityCheck, 16); } #endif @@ -1116,7 +1116,7 @@ SECURITY_STATUS ntlm_server_AuthenticateComplete(NTLM_CONTEXT* context) */ #ifdef WITH_DEBUG_NTLM - WLog_DBG(TAG, "No MIC present, using NtProofString for verification."); + WLog_VRB(TAG, "No MIC present, using NtProofString for verification."); #endif if (memcmp(context->NTLMv2Response.Response, context->NtProofString, 16) != 0) @@ -1142,28 +1142,28 @@ SECURITY_STATUS ntlm_server_AuthenticateComplete(NTLM_CONTEXT* context) /* Initialize RC4 seal state */ ntlm_init_rc4_seal_states(context); #ifdef WITH_DEBUG_NTLM - WLog_DBG(TAG, "ClientChallenge"); - winpr_HexDump(TAG, WLOG_DEBUG, context->ClientChallenge, 8); - WLog_DBG(TAG, "ServerChallenge"); - winpr_HexDump(TAG, WLOG_DEBUG, context->ServerChallenge, 8); - WLog_DBG(TAG, "SessionBaseKey"); - winpr_HexDump(TAG, WLOG_DEBUG, context->SessionBaseKey, 16); - WLog_DBG(TAG, "KeyExchangeKey"); - winpr_HexDump(TAG, WLOG_DEBUG, context->KeyExchangeKey, 16); - WLog_DBG(TAG, "ExportedSessionKey"); - winpr_HexDump(TAG, WLOG_DEBUG, context->ExportedSessionKey, 16); - WLog_DBG(TAG, "RandomSessionKey"); - winpr_HexDump(TAG, WLOG_DEBUG, context->RandomSessionKey, 16); - WLog_DBG(TAG, "ClientSigningKey"); - winpr_HexDump(TAG, WLOG_DEBUG, context->ClientSigningKey, 16); - WLog_DBG(TAG, "ClientSealingKey"); - winpr_HexDump(TAG, WLOG_DEBUG, context->ClientSealingKey, 16); - WLog_DBG(TAG, "ServerSigningKey"); - winpr_HexDump(TAG, WLOG_DEBUG, context->ServerSigningKey, 16); - WLog_DBG(TAG, "ServerSealingKey"); - winpr_HexDump(TAG, WLOG_DEBUG, context->ServerSealingKey, 16); - WLog_DBG(TAG, "Timestamp"); - winpr_HexDump(TAG, WLOG_DEBUG, context->Timestamp, 8); + WLog_VRB(TAG, "ClientChallenge"); + winpr_HexDump(TAG, WLOG_TRACE, context->ClientChallenge, 8); + WLog_VRB(TAG, "ServerChallenge"); + winpr_HexDump(TAG, WLOG_TRACE, context->ServerChallenge, 8); + WLog_VRB(TAG, "SessionBaseKey"); + winpr_HexDump(TAG, WLOG_TRACE, context->SessionBaseKey, 16); + WLog_VRB(TAG, "KeyExchangeKey"); + winpr_HexDump(TAG, WLOG_TRACE, context->KeyExchangeKey, 16); + WLog_VRB(TAG, "ExportedSessionKey"); + winpr_HexDump(TAG, WLOG_TRACE, context->ExportedSessionKey, 16); + WLog_VRB(TAG, "RandomSessionKey"); + winpr_HexDump(TAG, WLOG_TRACE, context->RandomSessionKey, 16); + WLog_VRB(TAG, "ClientSigningKey"); + winpr_HexDump(TAG, WLOG_TRACE, context->ClientSigningKey, 16); + WLog_VRB(TAG, "ClientSealingKey"); + winpr_HexDump(TAG, WLOG_TRACE, context->ClientSealingKey, 16); + WLog_VRB(TAG, "ServerSigningKey"); + winpr_HexDump(TAG, WLOG_TRACE, context->ServerSigningKey, 16); + WLog_VRB(TAG, "ServerSealingKey"); + winpr_HexDump(TAG, WLOG_TRACE, context->ServerSealingKey, 16); + WLog_VRB(TAG, "Timestamp"); + winpr_HexDump(TAG, WLOG_TRACE, context->Timestamp, 8); #endif context->state = NTLM_STATE_FINAL; ntlm_free_message_fields_buffer(&(message->DomainName)); diff --git a/winpr/libwinpr/thread/thread.c b/winpr/libwinpr/thread/thread.c index 598176e64..046be04a6 100644 --- a/winpr/libwinpr/thread/thread.c +++ b/winpr/libwinpr/thread/thread.c @@ -834,6 +834,7 @@ VOID DumpThreadHandles(void) winpr_backtrace_free(stack); WLog_DBG(TAG, "---------------- Start Dumping thread handles -----------"); +#if defined(WITH_THREAD_LIST) if (!thread_list) { WLog_DBG(TAG, "All threads properly shut down and disposed of."); @@ -877,6 +878,7 @@ VOID DumpThreadHandles(void) free(keys); ListDictionary_Unlock(thread_list); } +#endif WLog_DBG(TAG, "---------------- End Dumping thread handles -------------"); }