diff options
| author | Joshua M. Boniface <joshua@boniface.me> | 2020-11-27 01:59:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-27 01:59:58 -0500 |
| commit | 9169a28df195b999c3813f842780dd7763bbcc9f (patch) | |
| tree | b64a9107b52c1bb3017be11da760f36d3aca113b /MediaBrowser.Common/Cryptography/PasswordHash.cs | |
| parent | 536ac4c11cfff5349b973892f206fe5cfb0ae6f0 (diff) | |
| parent | 38932fc7d1c6851b6a282e9723bea471ef494b96 (diff) | |
Merge pull request #4588 from jellyfin/hex
Remove Hex class as the BCL has one now
Diffstat (limited to 'MediaBrowser.Common/Cryptography/PasswordHash.cs')
| -rw-r--r-- | MediaBrowser.Common/Cryptography/PasswordHash.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/MediaBrowser.Common/Cryptography/PasswordHash.cs b/MediaBrowser.Common/Cryptography/PasswordHash.cs index 3e12536ec..3e2eae1c8 100644 --- a/MediaBrowser.Common/Cryptography/PasswordHash.cs +++ b/MediaBrowser.Common/Cryptography/PasswordHash.cs @@ -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(); } } } |
