Merge branch 'jellyfin:master' into master

1 files changed, 16 insertions, 11 deletions

diff --git a/MediaBrowser.Common/Extensions/BaseExtensions.cs b/MediaBrowser.Common/Extensions/BaseExtensions.cs
index db0514bb1..08964420e 100644
--- a/MediaBrowser.Common/Extensions/BaseExtensions.cs
+++ b/MediaBrowser.Common/Extensions/BaseExtensions.cs
@@ -1,37 +1,42 @@
 using System;
+using System.Security.Cryptography;
+using System.Text;
 using System.Text.RegularExpressions;
-using MediaBrowser.Model.Cryptography;
 
 namespace MediaBrowser.Common.Extensions
 {
     /// <summary>
-    /// Class BaseExtensions
+    /// Class BaseExtensions.
     /// </summary>
     public static class BaseExtensions
     {
-        public static ICryptoProvider CryptographyProvider { get; set; }
-
         /// <summary>
         /// Strips the HTML.
         /// </summary>
         /// <param name="htmlString">The HTML string.</param>
-        /// <returns>System.String.</returns>
+        /// <returns><see cref="string" />.</returns>
         public static string StripHtml(this string htmlString)
         {
             // http://stackoverflow.com/questions/1349023/how-can-i-strip-html-from-text-in-net
-            const string pattern = @"<(.|\n)*?>";
+            const string Pattern = @"<(.|\n)*?>";
 
-            return Regex.Replace(htmlString, pattern, string.Empty).Trim();
+            return Regex.Replace(htmlString, Pattern, string.Empty).Trim();
         }
 
         /// <summary>
-        /// Gets the M d5.
+        /// Gets the Md5.
         /// </summary>
-        /// <param name="str">The STR.</param>
-        /// <returns>Guid.</returns>
+        /// <param name="str">The string.</param>
+        /// <returns><see cref="Guid" />.</returns>
         public static Guid GetMD5(this string str)
         {
-            return CryptographyProvider.GetMD5(str);
+#pragma warning disable CA5351
+            using (var provider = MD5.Create())
+            {
+                return new Guid(provider.ComputeHash(Encoding.Unicode.GetBytes(str)));
+            }
+
+#pragma warning restore CA5351
         }
     }
 }