From 14f563d7c2f7cf87f181bed1d06497adc436f88e Mon Sep 17 00:00:00 2001
From: sparky8251 <sparky@possumlodge.me>
Date: Thu, 19 Sep 2019 15:56:54 -0400
Subject: [PATCH] Removed WAN DDNS

It's odd that JF still had code lying around for generating a self signed cert. Currently, it does not do this so this code has been removed.

JF also appears to have functions in place to modify provided certs? Warrants deeper investigation. JF should not be attempting modifications of any certs under any circumstance.
---
 .../ApplicationHost.cs                        | 20 +++----------------
 .../Configuration/ServerConfiguration.cs      |  1 -
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index c9dccb16aa..1d0293a5f3 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1198,25 +1198,11 @@ namespace Emby.Server.Implementations
 
         private CertificateInfo GetCertificateInfo(bool generateCertificate)
         {
-            if (!string.IsNullOrWhiteSpace(ServerConfigurationManager.Configuration.CertificatePath))
-            {
-                // Custom cert
-                return new CertificateInfo
-                {
-                    Path = ServerConfigurationManager.Configuration.CertificatePath,
-                    Password = ServerConfigurationManager.Configuration.CertificatePassword
-                };
-            }
-
-            // Generate self-signed cert
-            var certHost = GetHostnameFromExternalDns(ServerConfigurationManager.Configuration.WanDdns);
-            var certPath = Path.Combine(ServerConfigurationManager.ApplicationPaths.ProgramDataPath, "ssl", "cert_" + (certHost + "2").GetMD5().ToString("N", CultureInfo.InvariantCulture) + ".pfx");
-            const string Password = "embycert";
-
+            // Custom cert
             return new CertificateInfo
             {
-                Path = certPath,
-                Password = Password
+                Path = ServerConfigurationManager.Configuration.CertificatePath,
+                Password = ServerConfigurationManager.Configuration.CertificatePassword
             };
         }
 
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index d64ea35eb9..24e7714037 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -162,7 +162,6 @@ namespace MediaBrowser.Model.Configuration
         public bool SkipDeserializationForBasicTypes { get; set; }
 
         public string ServerName { get; set; }
-        public string WanDdns { get; set; }
         public string BaseUrl { get; set; }
 
         public string UICulture { get; set; }