diff options
| author | JPVenson <github@jpb.email> | 2024-11-17 01:23:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-17 01:23:26 +0100 |
| commit | 427359deee0a029a36ed92f2668968b5976eb4a9 (patch) | |
| tree | 3b0206f69fdc5a04f2b46fd63c3d25c4c4fe424d /Emby.Server.Implementations/ApplicationHost.cs | |
| parent | 17e4485b946f5b58a0bed99312c57abb59181376 (diff) | |
| parent | 9e05abcc850c0c41818042d4383c621f54a6e40f (diff) | |
Merge branch 'master' into feature/EFUserData
Diffstat (limited to 'Emby.Server.Implementations/ApplicationHost.cs')
| -rw-r--r-- | Emby.Server.Implementations/ApplicationHost.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs index 372634340..5b99439f1 100644 --- a/Emby.Server.Implementations/ApplicationHost.cs +++ b/Emby.Server.Implementations/ApplicationHost.cs @@ -611,7 +611,7 @@ namespace Emby.Server.Implementations // Don't use an empty string password password = string.IsNullOrWhiteSpace(password) ? null : password; - var localCert = new X509Certificate2(path, password, X509KeyStorageFlags.UserKeySet); + var localCert = X509CertificateLoader.LoadPkcs12FromFile(path, password, X509KeyStorageFlags.UserKeySet); if (!localCert.HasPrivateKey) { Logger.LogError("No private key included in SSL cert {CertificateLocation}.", path); |