alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-05-27 19:08:27 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Remove Hex class as the BCL has one now

Browse Source
This commit is contained in:
Bond_009
2020-11-25 23:40:31 +01:00
parent 9534f55eb0
commit 8c8a71692e
12 changed files with 13 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
MediaBrowser.Common/Cryptography/PasswordHash.cs
View File

@@ -101,13 +101,13 @@ namespace MediaBrowser.Common.Cryptography
// Check if the string also contains a salt
if (splitted.Length - index == 2)
{
salt = Hex.Decode(splitted[index++]);
hash = Hex.Decode(splitted[index++]);
salt = Convert.FromHexString(splitted[index++]);
hash = Convert.FromHexString(splitted[index++]);
}
else
{
salt = Array.Empty<byte>();
hash = Hex.Decode(splitted[index++]);
hash = Convert.FromHexString(splitted[index++]);
}
return new PasswordHash(id, hash, salt, parameters);
@@ -144,11 +144,11 @@ namespace MediaBrowser.Common.Cryptography
if (_salt.Length != 0)
{
str.Append('$')
.Append(Hex.Encode(_salt, false));
.Append(Convert.ToHexString(_salt));
}
return str.Append('$')
.Append(Hex.Encode(_hash, false)).ToString();
.Append(Convert.ToHexString(_hash)).ToString();
}
}
}