zydronium/SMBLibrary
1
0
Fork 0
mirror of https://github.com/TalAloni/SMBLibrary.git synced 2025-04-30 10:47:48 +02:00
Code Issues Projects Releases Packages Wiki Activity

NegotiateContext: Fix parsing bugs

Browse source
This commit is contained in:
Tal Aloni 2024-07-30 20:03:47 +03:00
parent 2ff91c3017
commit 1aef438a8e
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
SMBLibrary/SMB2/Structures/NegotiateContext.cs
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2017 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved. /* Copyright (C) 2017-2024 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
* *
* You can redistribute this program and/or modify it under the terms of * You can redistribute this program and/or modify it under the terms of
* the GNU Lesser Public License as published by the Free Software Foundation, * the GNU Lesser Public License as published by the Free Software Foundation,
@ -31,7 +31,7 @@ namespace SMBLibrary.SMB2
ContextType = (NegotiateContextType)LittleEndianConverter.ToUInt16(buffer, offset + 0); ContextType = (NegotiateContextType)LittleEndianConverter.ToUInt16(buffer, offset + 0);
DataLength = LittleEndianConverter.ToUInt16(buffer, offset + 2); DataLength = LittleEndianConverter.ToUInt16(buffer, offset + 2);
Reserved = LittleEndianConverter.ToUInt32(buffer, offset + 4); Reserved = LittleEndianConverter.ToUInt32(buffer, offset + 4);
ByteReader.ReadBytes(buffer, offset + 8, DataLength); Data = ByteReader.ReadBytes(buffer, offset + 8, DataLength);
} }
public void WriteBytes(byte[] buffer, int offset) public void WriteBytes(byte[] buffer, int offset)
@ -51,6 +51,15 @@ namespace SMBLibrary.SMB2
} }
} }
public int PaddedLength
{
get
{
int paddingLength = (8 - (Data.Length % 8)) % 8;
return this.Length + paddingLength;
}
}
public static List<NegotiateContext> ReadNegotiateContextList(byte[] buffer, int offset, int count) public static List<NegotiateContext> ReadNegotiateContextList(byte[] buffer, int offset, int count)
{ {
List<NegotiateContext> result = new List<NegotiateContext>(); List<NegotiateContext> result = new List<NegotiateContext>();
@ -58,7 +67,7 @@ namespace SMBLibrary.SMB2
{ {
NegotiateContext context = new NegotiateContext(buffer, offset); NegotiateContext context = new NegotiateContext(buffer, offset);
result.Add(context); result.Add(context);
offset += context.Length; offset += context.PaddedLength;
} }
return result; return result;
} }
@ -69,10 +78,8 @@ namespace SMBLibrary.SMB2
for (int index = 0; index < negotiateContextList.Count; index++) for (int index = 0; index < negotiateContextList.Count; index++)
{ {
NegotiateContext context = negotiateContextList[index]; NegotiateContext context = negotiateContextList[index];
int length = context.Length;
int paddedLength = (int)Math.Ceiling((double)length / 8) * 8;
context.WriteBytes(buffer, offset); context.WriteBytes(buffer, offset);
offset += paddedLength; offset += context.PaddedLength;
} }
} }
@ -82,15 +89,13 @@ namespace SMBLibrary.SMB2
for (int index = 0; index < negotiateContextList.Count; index++) for (int index = 0; index < negotiateContextList.Count; index++)
{ {
NegotiateContext context = negotiateContextList[index]; NegotiateContext context = negotiateContextList[index];
int length = context.Length;
if (index < negotiateContextList.Count - 1) if (index < negotiateContextList.Count - 1)
{ {
int paddedLength = (int)Math.Ceiling((double)length / 8) * 8; result += context.PaddedLength;
result += paddedLength;
} }
else else
{ {
result += length; result += context.Length;
} }
} }
return result; return result;