diff --git a/SMBLibrary/NTFileStore/Structures/FileSystemInformation/FileFsObjectIdInformation.cs b/SMBLibrary/NTFileStore/Structures/FileSystemInformation/FileFsObjectIdInformation.cs index 05085ec..334e094 100644 --- a/SMBLibrary/NTFileStore/Structures/FileSystemInformation/FileFsObjectIdInformation.cs +++ b/SMBLibrary/NTFileStore/Structures/FileSystemInformation/FileFsObjectIdInformation.cs @@ -33,7 +33,7 @@ namespace SMBLibrary public override void WriteBytes(byte[] buffer, int offset) { - LittleEndianWriter.WriteGuidBytes(buffer, offset + 0, ObjectID); + LittleEndianWriter.WriteGuid(buffer, offset + 0, ObjectID); ByteWriter.WriteBytes(buffer, offset + 16, ExtendedInfo); } diff --git a/SMBLibrary/NTFileStore/Structures/IOCtl/ObjectIDBufferType1.cs b/SMBLibrary/NTFileStore/Structures/IOCtl/ObjectIDBufferType1.cs index 42ebfa7..8bc983b 100644 --- a/SMBLibrary/NTFileStore/Structures/IOCtl/ObjectIDBufferType1.cs +++ b/SMBLibrary/NTFileStore/Structures/IOCtl/ObjectIDBufferType1.cs @@ -38,10 +38,10 @@ namespace SMBLibrary public byte[] GetBytes() { byte[] buffer = new byte[Length]; - LittleEndianWriter.WriteGuidBytes(buffer, 0, ObjectId); - LittleEndianWriter.WriteGuidBytes(buffer, 16, BirthVolumeId); - LittleEndianWriter.WriteGuidBytes(buffer, 32, BirthObjectId); - LittleEndianWriter.WriteGuidBytes(buffer, 48, DomainId); + LittleEndianWriter.WriteGuid(buffer, 0, ObjectId); + LittleEndianWriter.WriteGuid(buffer, 16, BirthVolumeId); + LittleEndianWriter.WriteGuid(buffer, 32, BirthObjectId); + LittleEndianWriter.WriteGuid(buffer, 48, DomainId); return buffer; } } diff --git a/SMBLibrary/RPC/PDU/RequestPDU.cs b/SMBLibrary/RPC/PDU/RequestPDU.cs index 9066d44..c07b3c9 100644 --- a/SMBLibrary/RPC/PDU/RequestPDU.cs +++ b/SMBLibrary/RPC/PDU/RequestPDU.cs @@ -57,7 +57,7 @@ namespace SMBLibrary.RPC LittleEndianWriter.WriteUInt16(buffer, ref offset, OpNum); if ((Flags & PacketFlags.ObjectUUID) > 0) { - LittleEndianWriter.WriteGuidBytes(buffer, ref offset, ObjectGuid); + LittleEndianWriter.WriteGuid(buffer, ref offset, ObjectGuid); } ByteWriter.WriteBytes(buffer, ref offset, Data); ByteWriter.WriteBytes(buffer, ref offset, AuthVerifier); diff --git a/SMBLibrary/RPC/Structures/SyntaxID.cs b/SMBLibrary/RPC/Structures/SyntaxID.cs index ccb5a1c..34fa89c 100644 --- a/SMBLibrary/RPC/Structures/SyntaxID.cs +++ b/SMBLibrary/RPC/Structures/SyntaxID.cs @@ -35,7 +35,7 @@ namespace SMBLibrary.RPC public void WriteBytes(byte[] buffer, int offset) { - LittleEndianWriter.WriteGuidBytes(buffer, offset + 0, InterfaceUUID); + LittleEndianWriter.WriteGuid(buffer, offset + 0, InterfaceUUID); LittleEndianWriter.WriteUInt32(buffer, offset + 16, InterfaceVersion); } diff --git a/SMBLibrary/SMB1/Commands/NTCreateAndXResponseExtended.cs b/SMBLibrary/SMB1/Commands/NTCreateAndXResponseExtended.cs index dc04dab..97008ce 100644 --- a/SMBLibrary/SMB1/Commands/NTCreateAndXResponseExtended.cs +++ b/SMBLibrary/SMB1/Commands/NTCreateAndXResponseExtended.cs @@ -85,7 +85,7 @@ namespace SMBLibrary.SMB1 LittleEndianWriter.WriteUInt16(this.SMBParameters, ref parametersOffset, (ushort)ResourceType); LittleEndianWriter.WriteUInt16(this.SMBParameters, ref parametersOffset, NMPipeStatus_or_FileStatusFlags); ByteWriter.WriteByte(this.SMBParameters, ref parametersOffset, Convert.ToByte(Directory)); - LittleEndianWriter.WriteGuidBytes(this.SMBParameters, ref parametersOffset, VolumeGuid); + LittleEndianWriter.WriteGuid(this.SMBParameters, ref parametersOffset, VolumeGuid); LittleEndianWriter.WriteUInt64(this.SMBParameters, ref parametersOffset, FileID); LittleEndianWriter.WriteUInt32(this.SMBParameters, ref parametersOffset, (uint)MaximalAccessRights); LittleEndianWriter.WriteUInt32(this.SMBParameters, ref parametersOffset, (uint)GuestMaximalAccessRights); diff --git a/SMBLibrary/SMB1/Commands/NegotiateResponseExtended.cs b/SMBLibrary/SMB1/Commands/NegotiateResponseExtended.cs index 298401d..b1d1c11 100644 --- a/SMBLibrary/SMB1/Commands/NegotiateResponseExtended.cs +++ b/SMBLibrary/SMB1/Commands/NegotiateResponseExtended.cs @@ -74,7 +74,7 @@ namespace SMBLibrary.SMB1 ByteWriter.WriteByte(this.SMBParameters, 33, ChallengeLength); this.SMBData = new byte[16 + SecurityBlob.Length]; - LittleEndianWriter.WriteGuidBytes(this.SMBData, 0, ServerGuid); + LittleEndianWriter.WriteGuid(this.SMBData, 0, ServerGuid); ByteWriter.WriteBytes(this.SMBData, 16, SecurityBlob); return base.GetBytes(isUnicode); diff --git a/SMBLibrary/SMB2/Commands/NegotiateRequest.cs b/SMBLibrary/SMB2/Commands/NegotiateRequest.cs index 0265f44..58e0f5d 100644 --- a/SMBLibrary/SMB2/Commands/NegotiateRequest.cs +++ b/SMBLibrary/SMB2/Commands/NegotiateRequest.cs @@ -55,7 +55,7 @@ namespace SMBLibrary.SMB2 LittleEndianWriter.WriteUInt16(buffer, offset + 4, (ushort)SecurityMode); LittleEndianWriter.WriteUInt16(buffer, offset + 6, Reserved); LittleEndianWriter.WriteUInt32(buffer, offset + 8, (uint)Capabilities); - LittleEndianWriter.WriteGuidBytes(buffer, offset + 12, ClientGuid); + LittleEndianWriter.WriteGuid(buffer, offset + 12, ClientGuid); LittleEndianWriter.WriteInt64(buffer, offset + 28, ClientStartTime.ToFileTimeUtc()); for (int index = 0; index < Dialects.Count; index++) diff --git a/SMBLibrary/SMB2/Commands/NegotiateResponse.cs b/SMBLibrary/SMB2/Commands/NegotiateResponse.cs index 55352a4..af4edb3 100644 --- a/SMBLibrary/SMB2/Commands/NegotiateResponse.cs +++ b/SMBLibrary/SMB2/Commands/NegotiateResponse.cs @@ -81,7 +81,7 @@ namespace SMBLibrary.SMB2 LittleEndianWriter.WriteUInt16(buffer, offset + 2, (ushort)SecurityMode); LittleEndianWriter.WriteUInt16(buffer, offset + 4, (ushort)DialectRevision); LittleEndianWriter.WriteUInt16(buffer, offset + 6, NegotiateContextCount); - LittleEndianWriter.WriteGuidBytes(buffer, offset + 8, ServerGuid); + LittleEndianWriter.WriteGuid(buffer, offset + 8, ServerGuid); LittleEndianWriter.WriteUInt32(buffer, offset + 24, (uint)Capabilities); LittleEndianWriter.WriteUInt32(buffer, offset + 28, MaxTransactSize); LittleEndianWriter.WriteUInt32(buffer, offset + 32, MaxReadSize); diff --git a/Utilities/ByteUtils/BigEndianReader.cs b/Utilities/ByteUtils/BigEndianReader.cs index 05dd95a..640e9f9 100644 --- a/Utilities/ByteUtils/BigEndianReader.cs +++ b/Utilities/ByteUtils/BigEndianReader.cs @@ -52,7 +52,7 @@ namespace Utilities return BigEndianConverter.ToUInt64(buffer, offset - 8); } - public static Guid ReadGuidBytes(byte[] buffer, ref int offset) + public static Guid ReadGuid(byte[] buffer, ref int offset) { offset += 16; return BigEndianConverter.ToGuid(buffer, offset - 16); @@ -107,7 +107,7 @@ namespace Utilities return BigEndianConverter.ToUInt64(buffer, 0); } - public static Guid ReadGuidBytes(Stream stream) + public static Guid ReadGuid(Stream stream) { byte[] buffer = new byte[16]; stream.Read(buffer, 0, 16); diff --git a/Utilities/ByteUtils/BigEndianWriter.cs b/Utilities/ByteUtils/BigEndianWriter.cs index 2094a04..9769887 100644 --- a/Utilities/ByteUtils/BigEndianWriter.cs +++ b/Utilities/ByteUtils/BigEndianWriter.cs @@ -89,15 +89,15 @@ namespace Utilities offset += 8; } - public static void WriteGuidBytes(byte[] buffer, int offset, Guid value) + public static void WriteGuid(byte[] buffer, int offset, Guid value) { byte[] bytes = BigEndianConverter.GetBytes(value); Array.Copy(bytes, 0, buffer, offset, bytes.Length); } - public static void WriteGuidBytes(byte[] buffer, ref int offset, Guid value) + public static void WriteGuid(byte[] buffer, ref int offset, Guid value) { - WriteGuidBytes(buffer, offset, value); + WriteGuid(buffer, offset, value); offset += 16; } @@ -143,7 +143,7 @@ namespace Utilities stream.Write(bytes, 0, bytes.Length); } - public static void WriteGuidBytes(Stream stream, Guid value) + public static void WriteGuid(Stream stream, Guid value) { byte[] bytes = BigEndianConverter.GetBytes(value); stream.Write(bytes, 0, bytes.Length); diff --git a/Utilities/ByteUtils/LittleEndianReader.cs b/Utilities/ByteUtils/LittleEndianReader.cs index 1756d72..ff8aca6 100644 --- a/Utilities/ByteUtils/LittleEndianReader.cs +++ b/Utilities/ByteUtils/LittleEndianReader.cs @@ -89,7 +89,7 @@ namespace Utilities return LittleEndianConverter.ToUInt64(buffer, 0); } - public static Guid ReadGuidBytes(Stream stream) + public static Guid ReadGuid(Stream stream) { byte[] buffer = new byte[16]; stream.Read(buffer, 0, 16); diff --git a/Utilities/ByteUtils/LittleEndianWriter.cs b/Utilities/ByteUtils/LittleEndianWriter.cs index 486dac2..ac646d9 100644 --- a/Utilities/ByteUtils/LittleEndianWriter.cs +++ b/Utilities/ByteUtils/LittleEndianWriter.cs @@ -77,15 +77,15 @@ namespace Utilities offset += 8; } - public static void WriteGuidBytes(byte[] buffer, int offset, Guid value) + public static void WriteGuid(byte[] buffer, int offset, Guid value) { byte[] bytes = LittleEndianConverter.GetBytes(value); Array.Copy(bytes, 0, buffer, offset, bytes.Length); } - public static void WriteGuidBytes(byte[] buffer, ref int offset, Guid value) + public static void WriteGuid(byte[] buffer, ref int offset, Guid value) { - WriteGuidBytes(buffer, offset, value); + WriteGuid(buffer, offset, value); offset += 16; }