From ad4c5d1fc68a331108ac56b1630883023babb658 Mon Sep 17 00:00:00 2001 From: TalAloni Date: Sat, 23 Jan 2021 14:46:35 +0200 Subject: [PATCH] NTLM: AuthenticateMessage: Immitate Windows write order for easier comparison --- .../Authentication/NTLM/Structures/AuthenticateMessage.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SMBLibrary/Authentication/NTLM/Structures/AuthenticateMessage.cs b/SMBLibrary/Authentication/NTLM/Structures/AuthenticateMessage.cs index 060308a..b97866c 100644 --- a/SMBLibrary/Authentication/NTLM/Structures/AuthenticateMessage.cs +++ b/SMBLibrary/Authentication/NTLM/Structures/AuthenticateMessage.cs @@ -127,16 +127,16 @@ namespace SMBLibrary.Authentication.NTLM offset += MIC.Length; } - AuthenticationMessageUtils.WriteBufferPointer(buffer, 12, (ushort)LmChallengeResponse.Length, (uint)offset); - ByteWriter.WriteBytes(buffer, ref offset, LmChallengeResponse); - AuthenticationMessageUtils.WriteBufferPointer(buffer, 20, (ushort)NtChallengeResponse.Length, (uint)offset); - ByteWriter.WriteBytes(buffer, ref offset, NtChallengeResponse); AuthenticationMessageUtils.WriteBufferPointer(buffer, 28, (ushort)(DomainName.Length * 2), (uint)offset); ByteWriter.WriteUTF16String(buffer, ref offset, DomainName); AuthenticationMessageUtils.WriteBufferPointer(buffer, 36, (ushort)(UserName.Length * 2), (uint)offset); ByteWriter.WriteUTF16String(buffer, ref offset, UserName); AuthenticationMessageUtils.WriteBufferPointer(buffer, 44, (ushort)(WorkStation.Length * 2), (uint)offset); ByteWriter.WriteUTF16String(buffer, ref offset, WorkStation); + AuthenticationMessageUtils.WriteBufferPointer(buffer, 12, (ushort)LmChallengeResponse.Length, (uint)offset); + ByteWriter.WriteBytes(buffer, ref offset, LmChallengeResponse); + AuthenticationMessageUtils.WriteBufferPointer(buffer, 20, (ushort)NtChallengeResponse.Length, (uint)offset); + ByteWriter.WriteBytes(buffer, ref offset, NtChallengeResponse); AuthenticationMessageUtils.WriteBufferPointer(buffer, 52, (ushort)EncryptedRandomSessionKey.Length, (uint)offset); ByteWriter.WriteBytes(buffer, ref offset, EncryptedRandomSessionKey);