diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-09-03 03:29:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-03 03:29:18 -0400 |
| commit | 9cf5cd1e5b504619875be6c5b9e4d76a990686e7 (patch) | |
| tree | d6f6b236ac4da21746a9f3d7ce0cbe8b33761434 /Emby.Server.Implementations/ApplicationHost.cs | |
| parent | fd62146e464a35993afbd9f277c01eee2c3d4f51 (diff) | |
| parent | 2084678266e7e65dde077fc2caee63c0051bf3db (diff) | |
Merge pull request #2862 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Implementations/ApplicationHost.cs')
| -rw-r--r-- | Emby.Server.Implementations/ApplicationHost.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs index b3d39a520..b264cffe6 100644 --- a/Emby.Server.Implementations/ApplicationHost.cs +++ b/Emby.Server.Implementations/ApplicationHost.cs @@ -128,6 +128,7 @@ using MediaBrowser.Model.Events; using MediaBrowser.Model.Tasks; using MediaBrowser.Model.Threading; using StringExtensions = MediaBrowser.Controller.Extensions.StringExtensions; +using X509Certificate = System.Security.Cryptography.X509Certificates.X509Certificate; namespace Emby.Server.Implementations { @@ -1168,7 +1169,7 @@ namespace Emby.Server.Implementations } } - private ICertificate GetCertificate(CertificateInfo info) + private X509Certificate GetCertificate(CertificateInfo info) { var certificateLocation = info == null ? null : info.Path; @@ -1195,7 +1196,7 @@ namespace Emby.Server.Implementations return null; } - return new Certificate(localCert); + return localCert; } catch (Exception ex) { @@ -1584,7 +1585,7 @@ namespace Emby.Server.Implementations } private CertificateInfo CertificateInfo { get; set; } - private ICertificate Certificate { get; set; } + private X509Certificate Certificate { get; set; } private IEnumerable<string> GetUrlPrefixes() { |
