Merge remote-tracking branch 'upstream/master' into simplify-https-config

1 files changed, 18 insertions, 23 deletions

diff --git a/Emby.Server.Implementations/Cryptography/CryptographyProvider.cs b/Emby.Server.Implementations/Cryptography/CryptographyProvider.cs
index de83b023d..a037415a9 100644
--- a/Emby.Server.Implementations/Cryptography/CryptographyProvider.cs
+++ b/Emby.Server.Implementations/Cryptography/CryptographyProvider.cs
@@ -31,7 +31,7 @@ namespace Emby.Server.Implementations.Cryptography
 
         private RandomNumberGenerator _randomNumberGenerator;
 
-        private bool _disposed = false;
+        private bool _disposed;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="CryptographyProvider"/> class.
@@ -56,15 +56,13 @@ namespace Emby.Server.Implementations.Cryptography
         {
             // downgrading for now as we need this library to be dotnetstandard compliant
             // with this downgrade we'll add a check to make sure we're on the downgrade method at the moment
-            if (method == DefaultHashMethod)
+            if (method != DefaultHashMethod)
             {
-                using (var r = new Rfc2898DeriveBytes(bytes, salt, iterations))
-                {
-                    return r.GetBytes(32);
-                }
+                throw new CryptographicException($"Cannot currently use PBKDF2 with requested hash method: {method}");
             }
 
-            throw new CryptographicException($"Cannot currently use PBKDF2 with requested hash method: {method}");
+            using var r = new Rfc2898DeriveBytes(bytes, salt, iterations);
+            return r.GetBytes(32);
         }
 
         /// <inheritdoc />
@@ -74,25 +72,22 @@ namespace Emby.Server.Implementations.Cryptography
             {
                 return PBKDF2(hashMethod, bytes, salt, DefaultIterations);
             }
-            else if (_supportedHashMethods.Contains(hashMethod))
+
+            if (!_supportedHashMethods.Contains(hashMethod))
+            {
+                throw new CryptographicException($"Requested hash method is not supported: {hashMethod}");
+            }
+
+            using var h = HashAlgorithm.Create(hashMethod);
+            if (salt.Length == 0)
             {
-                using (var h = HashAlgorithm.Create(hashMethod))
-                {
-                    if (salt.Length == 0)
-                    {
-                        return h.ComputeHash(bytes);
-                    }
-                    else
-                    {
-                        byte[] salted = new byte[bytes.Length + salt.Length];
-                        Array.Copy(bytes, salted, bytes.Length);
-                        Array.Copy(salt, 0, salted, bytes.Length, salt.Length);
-                        return h.ComputeHash(salted);
-                    }
-                }
+                return h.ComputeHash(bytes);
             }
 
-            throw new CryptographicException($"Requested hash method is not supported: {hashMethod}");
+            byte[] salted = new byte[bytes.Length + salt.Length];
+            Array.Copy(bytes, salted, bytes.Length);
+            Array.Copy(salt, 0, salted, bytes.Length, salt.Length);
+            return h.ComputeHash(salted);
         }
 
         /// <inheritdoc />