diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-05-01 16:05:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-01 16:05:43 -0400 |
| commit | 090783d41aebb9e70112e8df0191526a7fe696e6 (patch) | |
| tree | c9e4945811ff7002e25b1588fb99cd4501a4cac6 /MediaBrowser.Server.Startup.Common | |
| parent | a5a734978cd8ea186580709dc8ce50c45549b6f1 (diff) | |
| parent | f0ebe1cac87c59dd2d86c6582d0760afe1182191 (diff) | |
Merge pull request #2608 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Server.Startup.Common')
| -rw-r--r-- | MediaBrowser.Server.Startup.Common/Cryptography/CertificateGenerator.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/MediaBrowser.Server.Startup.Common/Cryptography/CertificateGenerator.cs b/MediaBrowser.Server.Startup.Common/Cryptography/CertificateGenerator.cs index 9e14b7713d..4f5b3d0042 100644 --- a/MediaBrowser.Server.Startup.Common/Cryptography/CertificateGenerator.cs +++ b/MediaBrowser.Server.Startup.Common/Cryptography/CertificateGenerator.cs @@ -12,6 +12,7 @@ namespace Emby.Common.Implementations.Security public static void CreateSelfSignCertificatePfx( string fileName, string hostname, + string password, ILogger logger) { if (string.IsNullOrWhiteSpace(fileName)) @@ -43,7 +44,7 @@ namespace Emby.Common.Implementations.Security cb.NotAfter = notAfter; cb.SubjectName = subject; cb.SubjectPublicKey = subjectKey; - + // signature cb.Hash = "SHA256"; byte[] rawcert = cb.Sign(issuerKey); @@ -59,6 +60,7 @@ namespace Emby.Common.Implementations.Security attributes.Add(PKCS9.localKeyId, list); p12.AddCertificate(new X509Certificate(rawcert), attributes); + p12.Password = password; p12.AddPkcs8ShroudedKeyBag(subjectKey, attributes); p12.SaveToFile(fileName); |