Skip to content

Commit 2f4340a

Browse files
Support for .crt der encoded files
1 parent 469e26a commit 2f4340a

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

AnyAgent/CertManager.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
using System.Security.Cryptography.X509Certificates;
2222
using System.Text;
2323
using CSS.Common.Logging;
24+
using CSS.PKI.PEM;
2425
using DataPower.API.api;
2526
using DataPower.API.client;
2627
using Keyfactor.Platform.Extensions.Agents;
@@ -756,13 +757,15 @@ public InventoryResult GetPublicCerts(ApiClient apiClient)
756757

757758
Logger.Trace($"Add to List: {pc.Name}");
758759
var pem = Convert.FromBase64String(viewCertResponse.File);
759-
var pemString = Encoding.UTF8.GetString(pem);
760+
761+
var pemString = pc.Name.EndsWith(".crt") ? PemUtilities.DERToPEM(pem, PemUtilities.PemObjectType.Certificate) : Encoding.UTF8.GetString(pem);
762+
760763
Logger.Trace($"Pem File: {pemString}");
761764

762765
if (pemString.Contains("BEGIN CERTIFICATE"))
763766
{
764767
Logger.Trace("Valid Pem File Adding to KF");
765-
var cert = new X509Certificate2(pem);
768+
var cert = new X509Certificate2(pemString);
766769
var b64 = Convert.ToBase64String(cert.Export(X509ContentType.Cert));
767770
Logger.Trace($"Created X509Certificate2: {cert.SerialNumber} : {cert.Subject}");
768771

0 commit comments

Comments
 (0)