Skip to content

Fix hash string case #2094

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
mattjohnsonpint merged 1 commit into from
Dec 21, 2022
Merged

Fix hash string case #2094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/Sentry/Internal/Extensions/HashExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ namespace Sentry.Internal.Extensions;

internal static class HashExtensions
{
public static string GetHashString(this string str)
public static string GetHashString(this string str, bool upperCase = true)
Comment thread
mattjohnsonpint marked this conversation as resolved.
{
var bytes = Encoding.UTF8.GetBytes(str);
using var sha = SHA1.Create();
var hash = sha.ComputeHash(bytes);
return hash.ToHexString();
return hash.ToHexString(upperCase);
}
}
17 changes: 11 additions & 6 deletions src/Sentry/Internal/Extensions/MiscExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,27 @@ internal static class MiscExtensions
? value
: null;

public static string ToHexString(this long l) => "0x" + l.ToString("x", CultureInfo.InvariantCulture);
public static string ToHexString(this long l, bool upperCase = false) =>
"0x" + l.ToString("x", CultureInfo.InvariantCulture);

public static string ToHexString(this byte[] bytes) => new ReadOnlySpan<byte>(bytes).ToHexString();
public static string ToHexString(this byte[] bytes, bool upperCase = false) =>
new ReadOnlySpan<byte>(bytes).ToHexString(upperCase);

public static string ToHexString(this Span<byte> bytes) => ((ReadOnlySpan<byte>)bytes).ToHexString();
public static string ToHexString(this Span<byte> bytes, bool upperCase = false) =>
((ReadOnlySpan<byte>)bytes).ToHexString(upperCase);

public static string ToHexString(this ReadOnlySpan<byte> bytes)
public static string ToHexString(this ReadOnlySpan<byte> bytes, bool upperCase = false)
{
#if NET5_0_OR_GREATER
return Convert.ToHexString(bytes).ToLowerInvariant();
var s = Convert.ToHexString(bytes);
return upperCase ? s : s.ToLowerInvariant();
#else
var buffer = new StringBuilder(bytes.Length * 2);
var format = upperCase ? "X2" : "x2";

foreach (var t in bytes)
{
buffer.Append(t.ToString("x2", CultureInfo.InvariantCulture));
buffer.Append(t.ToString(format, CultureInfo.InvariantCulture));
}

return buffer.ToString();
Expand Down