aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations/Library/DefaultAuthenticationProvider.cs
diff options
context:
space:
mode:
authorBond-009 <bond.009@outlook.com>2019-03-27 16:34:26 +0100
committerGitHub <noreply@github.com>2019-03-27 16:34:26 +0100
commitd0fbd260d5cc386119d96f53cdc1d164b80d02df (patch)
tree55d465b25aae29128b77d1867f0bfd9a1fc3708f /Emby.Server.Implementations/Library/DefaultAuthenticationProvider.cs
parent7f42dcc60fd3aaf30f2408f6bddeb2b8bf921cdf (diff)
parent524357bfa845e1c01ef280b1d0fc3896b7b9dbaa (diff)
Merge branch 'master' into httpclient
Diffstat (limited to 'Emby.Server.Implementations/Library/DefaultAuthenticationProvider.cs')
-rw-r--r--Emby.Server.Implementations/Library/DefaultAuthenticationProvider.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/Library/DefaultAuthenticationProvider.cs b/Emby.Server.Implementations/Library/DefaultAuthenticationProvider.cs
index 3ec1f81d3..3d15a8afb 100644
--- a/Emby.Server.Implementations/Library/DefaultAuthenticationProvider.cs
+++ b/Emby.Server.Implementations/Library/DefaultAuthenticationProvider.cs
@@ -52,7 +52,7 @@ namespace Emby.Server.Implementations.Library
PasswordHash readyHash = new PasswordHash(resolvedUser.Password);
byte[] calculatedHash;
string calculatedHashString;
- if (_cryptographyProvider.GetSupportedHashMethods().Contains(readyHash.Id))
+ if (_cryptographyProvider.GetSupportedHashMethods().Contains(readyHash.Id) || _cryptographyProvider.DefaultHashMethod == readyHash.Id)
{
if (string.IsNullOrEmpty(readyHash.Salt))
{