Skip to content
Open
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/Shared/CertificateGeneration/CertificateManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ internal ImportCertificateResult ImportCertificate(string certificatePath, strin
return ImportCertificateResult.ExistingCertificatesPresent;
}

X509Certificate2 certificate;
X509Certificate2? certificate = null;
try
{
Log.LoadCertificateStart(certificatePath);
Expand All @@ -470,6 +470,7 @@ internal ImportCertificateResult ImportCertificate(string certificatePath, strin
{
Log.LoadCertificateError(e.ToString());
}
certificate?.Dispose();
return ImportCertificateResult.InvalidCertificate;
}

Expand All @@ -482,22 +483,25 @@ internal ImportCertificateResult ImportCertificate(string certificatePath, strin
{
Log.NoHttpsDevelopmentCertificate(GetDescription(certificate));
}
certificate.Dispose();
return ImportCertificateResult.NoDevelopmentHttpsCertificate;
}

try
{
SaveCertificate(certificate);
certificate = SaveCertificate(certificate);
}
catch (Exception e)
{
if (Log.IsEnabled())
{
Log.SaveCertificateInStoreError(e.ToString());
}
certificate.Dispose();
return ImportCertificateResult.ErrorSavingTheCertificateIntoTheCurrentUserPersonalStore;
}

certificate.Dispose();
return ImportCertificateResult.Succeeded;
}

Expand Down
Loading