diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-05-10 15:15:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-10 15:15:14 -0400 |
| commit | 6ee9da3717a563d110fc56c93478885d19449cce (patch) | |
| tree | f353dec0ac06811918b33f6deed4e7fbe3c27935 /Emby.Server.Core/ApplicationHost.cs | |
| parent | 06a1393abed20137844f062e44cf8ae7feb9e8f6 (diff) | |
| parent | b9baf377e81e454438d9faad1b1b793a719bb667 (diff) | |
Merge pull request #2628 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Core/ApplicationHost.cs')
| -rw-r--r-- | Emby.Server.Core/ApplicationHost.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Emby.Server.Core/ApplicationHost.cs b/Emby.Server.Core/ApplicationHost.cs index 6a3881caf..5ceef0754 100644 --- a/Emby.Server.Core/ApplicationHost.cs +++ b/Emby.Server.Core/ApplicationHost.cs @@ -761,7 +761,10 @@ namespace Emby.Server.Core return null; } - X509Certificate2 localCert = new X509Certificate2(certificateLocation, info.Password); + // Don't use an empty string password + var password = string.IsNullOrWhiteSpace(info.Password) ? null : info.Password; + + X509Certificate2 localCert = new X509Certificate2(certificateLocation, password); //localCert.PrivateKey = PrivateKey.CreateFromFile(pvk_file).RSA; if (!localCert.HasPrivateKey) { |