Merge pull request #1 from MediaBrowser/master

Update to latest

1 files changed, 18 insertions, 3 deletions

diff --git a/MediaBrowser.Server.Implementations/Security/EncryptionManager.cs b/MediaBrowser.Server.Implementations/Security/EncryptionManager.cs
index 73a4e3004..cd9b9651e 100644
--- a/MediaBrowser.Server.Implementations/Security/EncryptionManager.cs
+++ b/MediaBrowser.Server.Implementations/Security/EncryptionManager.cs
@@ -1,6 +1,5 @@
 using MediaBrowser.Controller.Security;
 using System;
-using System.Security.Cryptography;
 using System.Text;
 
 namespace MediaBrowser.Server.Implementations.Security
@@ -17,7 +16,7 @@ namespace MediaBrowser.Server.Implementations.Security
         {
             if (value == null) throw new ArgumentNullException("value");
 
-            return Encoding.Default.GetString(ProtectedData.Protect(Encoding.Default.GetBytes(value), null, DataProtectionScope.LocalMachine));
+            return EncryptStringUniversal(value);
         }
 
         /// <summary>
@@ -30,7 +29,23 @@ namespace MediaBrowser.Server.Implementations.Security
         {
             if (value == null) throw new ArgumentNullException("value");
 
-            return Encoding.Default.GetString(ProtectedData.Unprotect(Encoding.Default.GetBytes(value), null, DataProtectionScope.LocalMachine));
+            return DecryptStringUniversal(value);
+        }
+
+        private string EncryptStringUniversal(string value)
+        {
+            // Yes, this isn't good, but ProtectedData in mono is throwing exceptions, so use this for now
+
+            var bytes = Encoding.UTF8.GetBytes(value);
+            return Convert.ToBase64String(bytes);
+        }
+
+        private string DecryptStringUniversal(string value)
+        {
+            // Yes, this isn't good, but ProtectedData in mono is throwing exceptions, so use this for now
+
+            var bytes = Convert.FromBase64String(value);
+            return Encoding.UTF8.GetString(bytes);
         }
     }
 }