diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-09-28 13:06:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-28 13:06:15 -0400 |
| commit | d9c4f2942781efc4a9417dd88a39592975a5f85f (patch) | |
| tree | 14fa1d72fd4e2f8f7e2b16df1f539b22e7aba5c3 /Emby.Server.Implementations/ApplicationHost.cs | |
| parent | 80822d98e4ad3df7cb2e54385c76989ea5945ab3 (diff) | |
| parent | f2444d97a0d1b2d69e5b73dd82bc4a76e73b00f0 (diff) | |
Merge pull request #2921 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Implementations/ApplicationHost.cs')
| -rw-r--r-- | Emby.Server.Implementations/ApplicationHost.cs | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs index 894d91f71b..6996210435 100644 --- a/Emby.Server.Implementations/ApplicationHost.cs +++ b/Emby.Server.Implementations/ApplicationHost.cs @@ -7,7 +7,6 @@ using Emby.Dlna.MediaReceiverRegistrar; using Emby.Dlna.Ssdp; using Emby.Drawing; using Emby.Photos; -using Emby.Server.Core.Cryptography; using Emby.Server.Implementations.Activity; using Emby.Server.Implementations.Archiving; using Emby.Server.Implementations.Channels; @@ -1640,23 +1639,23 @@ namespace Emby.Server.Implementations var certPath = Path.Combine(ServerConfigurationManager.ApplicationPaths.ProgramDataPath, "ssl", "cert_" + (certHost + "2").GetMD5().ToString("N") + ".pfx"); var password = "embycert"; - if (generateCertificate) - { - if (!FileSystemManager.FileExists(certPath)) - { - FileSystemManager.CreateDirectory(FileSystemManager.GetDirectoryName(certPath)); - - try - { - CertificateGenerator.CreateSelfSignCertificatePfx(certPath, certHost, password, Logger); - } - catch (Exception ex) - { - Logger.ErrorException("Error creating ssl cert", ex); - return null; - } - } - } + //if (generateCertificate) + //{ + // if (!FileSystemManager.FileExists(certPath)) + // { + // FileSystemManager.CreateDirectory(FileSystemManager.GetDirectoryName(certPath)); + + // try + // { + // CertificateGenerator.CreateSelfSignCertificatePfx(certPath, certHost, password, Logger); + // } + // catch (Exception ex) + // { + // Logger.ErrorException("Error creating ssl cert", ex); + // return null; + // } + // } + //} return new CertificateInfo { |