aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Mono
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2016-06-30 23:06:40 -0400
committerGitHub <noreply@github.com>2016-06-30 23:06:40 -0400
commitd92bcd42c63b844248aae08bec5abe8b4bc83df7 (patch)
tree491fb36e2527af2e9eb23017eb78daffc92497ea /MediaBrowser.Server.Mono
parent55de77ca28348fd0072b81bedbdc170b5a634e7d (diff)
parent00634b62c53d145e3dc6ad707dfbe98cb21bfa5a (diff)
Merge pull request #1903 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Server.Mono')
-rw-r--r--MediaBrowser.Server.Mono/Security/PKCS12.cs29
1 files changed, 0 insertions, 29 deletions
diff --git a/MediaBrowser.Server.Mono/Security/PKCS12.cs b/MediaBrowser.Server.Mono/Security/PKCS12.cs
index f6c32421e8..b5da09c630 100644
--- a/MediaBrowser.Server.Mono/Security/PKCS12.cs
+++ b/MediaBrowser.Server.Mono/Security/PKCS12.cs
@@ -1929,34 +1929,5 @@ namespace MediaBrowser.Server.Mono.Security {
password_max_length = value;
}
}
-
- // static methods
-
- static private byte[] LoadFile (string filename)
- {
- byte[] data = null;
- using (FileStream fs = File.OpenRead (filename)) {
- data = new byte [fs.Length];
- fs.Read (data, 0, data.Length);
- fs.Close ();
- }
- return data;
- }
-
- static public PKCS12 LoadFromFile (string filename)
- {
- if (filename == null)
- throw new ArgumentNullException ("filename");
-
- return new PKCS12 (LoadFile (filename));
- }
-
- static public PKCS12 LoadFromFile (string filename, string password)
- {
- if (filename == null)
- throw new ArgumentNullException ("filename");
-
- return new PKCS12 (LoadFile (filename), password);
- }
}
}