Skip to content

Fix ManagedNtlm on big-endian architectures #124598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rzikm merged 4 commits into from
Feb 23, 2026
Merged

Fix ManagedNtlm on big-endian architectures #124598

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
91fc6d6
Added big-endian support for ManagedNtlm
ShreyaLaxminarayan Feb 19, 2026
855ba8e
Merge branch 'main' into ntlm
ShreyaLaxminarayan Feb 19, 2026
5cfc009
Added getters and setters to deal with endianness
ShreyaLaxminarayan Feb 23, 2026
a8cb92d
Fixed typo
ShreyaLaxminarayan Feb 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions src/libraries/System.Net.Security/src/System/Net/NegotiateAuthenticationPal.ManagedNtlm.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,12 @@ private unsafe struct MessageField
{
public ushort Length;
public ushort MaximumLength;
public int PayloadOffset;
private int _payloadOffset;
public int PayloadOffset
{
readonly get =>BitConverter.IsLittleEndian? _payloadOffset: BinaryPrimitives.ReverseEndianness(_payloadOffset);
set =>_payloadOffset = BitConverter.IsLittleEndian? value: BinaryPrimitives.ReverseEndianness(value);
Comment on lines +134 to +135
Copy link
Member

@gfoidl gfoidl Feb 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit:

Suggested change
readonly get =>BitConverter.IsLittleEndian? _payloadOffset: BinaryPrimitives.ReverseEndianness(_payloadOffset);
set =>_payloadOffset = BitConverter.IsLittleEndian? value: BinaryPrimitives.ReverseEndianness(value);
readonly get => BitConverter.IsLittleEndian? _payloadOffset: BinaryPrimitives.ReverseEndianness(_payloadOffset);
set => _payloadOffset = BitConverter.IsLittleEndian? value: BinaryPrimitives.ReverseEndianness(value);

}
}

[StructLayout(LayoutKind.Sequential)]
Expand All @@ -146,22 +151,32 @@ private unsafe struct Version
{
public byte VersionMajor;
public byte VersionMinor;
public ushort ProductBuild;
private ushort _productBuild;
private byte _unused4;
private byte _unused5;
private byte _unused6;
public byte CurrentRevision;
public ushort ProductBuild
{
readonly get =>BitConverter.IsLittleEndian? _productBuild: BinaryPrimitives.ReverseEndianness(_productBuild);
set =>_productBuild = BitConverter.IsLittleEndian? value: BinaryPrimitives.ReverseEndianness(value);
Comment on lines +161 to +162
Copy link
Member

@gfoidl gfoidl Feb 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
readonly get =>BitConverter.IsLittleEndian? _productBuild: BinaryPrimitives.ReverseEndianness(_productBuild);
set =>_productBuild = BitConverter.IsLittleEndian? value: BinaryPrimitives.ReverseEndianness(value);
readonly get => BitConverter.IsLittleEndian? _productBuild: BinaryPrimitives.ReverseEndianness(_productBuild);
set => _productBuild = BitConverter.IsLittleEndian? value: BinaryPrimitives.ReverseEndianness(value);

}
}

// Type 1 message
[StructLayout(LayoutKind.Sequential)]
private unsafe struct NegotiateMessage
{
public MessageHeader Header;
public Flags Flags;
private Flags _flags;
public MessageField DomainName;
public MessageField WorkStation;
public Version Version;
public Flags Flags
{
readonly get =>BitConverter.IsLittleEndian? _flags: (Flags)BinaryPrimitives.ReverseEndianness((uint)_flags);
set =>_flags = BitConverter.IsLittleEndian? value: (Flags)BinaryPrimitives.ReverseEndianness((uint)value);
Comment on lines +177 to +178
Copy link
Member

@gfoidl gfoidl Feb 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
readonly get =>BitConverter.IsLittleEndian? _flags: (Flags)BinaryPrimitives.ReverseEndianness((uint)_flags);
set =>_flags = BitConverter.IsLittleEndian? value: (Flags)BinaryPrimitives.ReverseEndianness((uint)value);
readonly get => BitConverter.IsLittleEndian? _flags: (Flags)BinaryPrimitives.ReverseEndianness((uint)_flags);
set => _flags = BitConverter.IsLittleEndian? value: (Flags)BinaryPrimitives.ReverseEndianness((uint)value);

}
}

// TYPE 2 message
Expand Down Expand Up @@ -486,7 +501,7 @@ private byte[] ProcessTargetInfo(ReadOnlySpan<byte> targetInfo, out DateTime tim

if (ID == AvId.Timestamp)
{
time = DateTime.FromFileTimeUtc(BitConverter.ToInt64(info.Slice(4, 8)));
time = DateTime.FromFileTimeUtc(BinaryPrimitives.ReadInt64LittleEndian(info.Slice(4, 8)));
}
else if (ID == AvId.TargetName || ID == AvId.ChannelBindings)
{
Expand Down
Loading