Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/dotnet/aspnetcore.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Calvarro Nelson <jacalvar@microsoft.com>2019-11-13 17:37:28 +0300
committerJavier Calvarro Nelson <jacalvar@microsoft.com>2019-11-13 17:37:28 +0300
commit90b71d42539f3885e7bd26c44e411c3e571196fb (patch)
tree04364f393b2a04e35ea5cc07159950b73e21634f
parenta22171d0872d53078b323dc003b27db9068fd5b2 (diff)
Use the originally generated certificatejaviercn/certificate-mac-os-alternative
-rw-r--r--src/Shared/CertificateGeneration/CertificateManager.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Shared/CertificateGeneration/CertificateManager.cs b/src/Shared/CertificateGeneration/CertificateManager.cs
index b893155f8d..29e1051552 100644
--- a/src/Shared/CertificateGeneration/CertificateManager.cs
+++ b/src/Shared/CertificateGeneration/CertificateManager.cs
@@ -298,7 +298,9 @@ namespace Microsoft.AspNetCore.Certificates.Generation
// way that works across security contexts without requiring user interaction.
var password = Guid.NewGuid().ToString("N");
var export = certificate.Export(X509ContentType.Pkcs12, password);
- var imported = new X509Certificate2(export, password, X509KeyStorageFlags.PersistKeySet | X509KeyStorageFlags.Exportable);
+ var imported = !RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ?
+ new X509Certificate2(export, password, X509KeyStorageFlags.PersistKeySet | X509KeyStorageFlags.Exportable) :
+ certificate;
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{