Skip to content

Commit 58f13aa

Browse files
committed
cert parsing
1 parent 5f75d63 commit 58f13aa

1 file changed

Lines changed: 10 additions & 2 deletions

File tree

sectigo-scm-caplugin/Client/SectigoClient.cs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,8 +315,16 @@ public static SectigoClient InitializeClient(SectigoConfig config, ICertificateR
315315
if (config.AuthenticationType.ToLower() == "certificate")
316316
{
317317
clientHandler.ClientCertificateOptions = ClientCertificateOption.Manual;
318-
Logger.LogTrace($"Cert info: \nSource: {config.Certificate.Source}\nThumb: {config.Certificate.Thumbprint}\nStoreName: {config.Certificate.StoreName}\nStoreLoc: {config.Certificate.StoreLocation}\nPath: {config.Certificate.CertificatePath}\nPass: {config.Certificate.CertificatePassword}\nImported: {config.Certificate.ImportedCertificate}\nImportedPass: {config.Certificate.ImportedCertificatePassword}");
319-
X509Certificate2 authCert = certResolver.ResolveCertificate(config.Certificate);
318+
//Logger.LogTrace($"Cert info: \nSource: {config.Certificate.Source}\nThumb: {config.Certificate.Thumbprint}\nStoreName: {config.Certificate.StoreName}\nStoreLoc: {config.Certificate.StoreLocation}\nPath: {config.Certificate.CertificatePath}\nPass: {config.Certificate.CertificatePassword}\nImported: {config.Certificate.ImportedCertificate}\nImportedPass: {config.Certificate.ImportedCertificatePassword}");
319+
X509Certificate2 authCert = null;
320+
if (!string.IsNullOrEmpty(config.Certificate.ImportedCertificate))
321+
{
322+
authCert = new X509Certificate2(Convert.FromBase64String(config.Certificate.ImportedCertificate), config.Certificate.ImportedCertificatePassword);
323+
}
324+
else
325+
{
326+
authCert = certResolver.ResolveCertificate(config.Certificate);
327+
}
320328
if (authCert == null)
321329
{
322330
Logger.MethodExit(LogLevel.Debug);

0 commit comments

Comments
 (0)