Merge branch 'jellyfin:master' into master

1 files changed, 14 insertions, 6 deletions

diff --git a/MediaBrowser.Model/Cryptography/ICryptoProvider.cs b/MediaBrowser.Model/Cryptography/ICryptoProvider.cs
index b027d2ad0..d8b7d848a 100644
--- a/MediaBrowser.Model/Cryptography/ICryptoProvider.cs
+++ b/MediaBrowser.Model/Cryptography/ICryptoProvider.cs
@@ -1,13 +1,21 @@
-using System;
-using System.IO;
+#pragma warning disable CS1591
+
+using System.Collections.Generic;
 
 namespace MediaBrowser.Model.Cryptography
 {
     public interface ICryptoProvider
     {
-        Guid GetMD5(string str);
-        byte[] ComputeMD5(Stream str);
-        byte[] ComputeMD5(byte[] bytes);
-        byte[] ComputeSHA1(byte[] bytes);
+        string DefaultHashMethod { get; }
+
+        IEnumerable<string> GetSupportedHashMethods();
+
+        byte[] ComputeHash(string hashMethod, byte[] bytes, byte[] salt);
+
+        byte[] ComputeHashWithDefaultMethod(byte[] bytes, byte[] salt);
+
+        byte[] GenerateSalt();
+
+        byte[] GenerateSalt(int length);
     }
 }