Skip to content

Use FixedTimeEquals in NETCore targets #2857

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
westin-m merged 7 commits into from
Oct 10, 2024
Merged

Use FixedTimeEquals in NETCore targets #2857

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e009ebb
use fixedtimeequals
westin-m Sep 30, 2024
7705946
apply change to span version
westin-m Sep 30, 2024
4f489c5
Merge branch 'dev' into westin/useFixedTimeEquals
westin-m Oct 1, 2024
6ae2b38
Merge branch 'dev' into westin/useFixedTimeEquals
westin-m Oct 8, 2024
f32128b
Apply NoOptimization
westin-m Oct 8, 2024
a2fcd58
Merge branch 'westin/useFixedTimeEquals' of https://github.com/AzureA…
westin-m Oct 8, 2024
c50e6bf
Merge branch 'dev' into westin/useFixedTimeEquals
westin-m Oct 8, 2024
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
14 changes: 10 additions & 4 deletions src/Microsoft.IdentityModel.Tokens/Utility.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public static bool IsHttps(Uri uri)
/// <returns>
/// true if the bytes are equal, false otherwise.
/// </returns>
[MethodImpl(MethodImplOptions.NoInlining)]
[MethodImpl(MethodImplOptions.NoInlining | MethodImplOptions.NoOptimization)]
public static bool AreEqual(byte[] a, byte[] b)
{
ReadOnlySpan<byte> a1, a2;
Expand All @@ -151,13 +151,16 @@ public static bool AreEqual(byte[] a, byte[] b)
a2 = b.AsSpan();
}

#if NETCOREAPP
return System.Security.Cryptography.CryptographicOperations.FixedTimeEquals(a1, a2);
#else
int result = 0;
for (int i = 0; i < a1.Length; i++)
{
result |= a1[i] ^ a2[i];
}

return result == 0;
#endif
}

/// <summary>
Expand All @@ -174,7 +177,7 @@ public static bool AreEqual(byte[] a, byte[] b)
/// <returns>
/// true if the bytes are equal, false otherwise.
/// </returns>
[MethodImpl(MethodImplOptions.NoInlining)]
[MethodImpl(MethodImplOptions.NoInlining | MethodImplOptions.NoOptimization)]
internal static bool AreEqual(ReadOnlySpan<byte> a, ReadOnlySpan<byte> b, int length)
{
if ((a.Length < length || b.Length < length))
Expand All @@ -189,13 +192,16 @@ internal static bool AreEqual(ReadOnlySpan<byte> a, ReadOnlySpan<byte> b, int le
b = b.Slice(0, length);
}

#if NETCOREAPP
return System.Security.Cryptography.CryptographicOperations.FixedTimeEquals(a, b);
#else
int result = 0;
for (int i = 0; i < a.Length; i++)
{
result |= a[i] ^ b[i];
}

return result == 0;
#endif
}

internal static byte[] ConvertToBigEndian(long i)
Expand Down