Use X509CertificateLoader

gamingrobot · gamingrobot · commit ef0ba3738c6c · 2025-11-25T18:41:54.000-06:00
diff --git a/src/Contrast.K8s.AgentOperator/Core/Tls/TlsCertificateChainConverter.cs b/src/Contrast.K8s.AgentOperator/Core/Tls/TlsCertificateChainConverter.cs
@@ -31,8 +31,8 @@ public TlsCertificateChainExport Export(TlsCertificateChain chain)
 
     public TlsCertificateChain Import(TlsCertificateChainExport export)
     {
-        var caCertificate = new X509Certificate2(export.CaCertificatePfx, (string?)null, X509KeyStorageFlags.Exportable);
-        var serverCertificate = new X509Certificate2(export.ServerCertificatePfx, (string?)null, X509KeyStorageFlags.Exportable);
+        var caCertificate = X509CertificateLoader.LoadPkcs12(export.CaCertificatePfx, null, X509KeyStorageFlags.Exportable);
+        var serverCertificate = X509CertificateLoader.LoadPkcs12(export.ServerCertificatePfx, null, X509KeyStorageFlags.Exportable);
 
         return new TlsCertificateChain(caCertificate, serverCertificate, export.SansHash, export.Version);
     }

Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,8 @@ public TlsCertificateChainExport Export(TlsCertificateChain chain)`
`31`	`31`
`32`	`32`	`public TlsCertificateChain Import(TlsCertificateChainExport export)`
`33`	`33`	`{`
`34`		`- var caCertificate = new X509Certificate2(export.CaCertificatePfx, (string?)null, X509KeyStorageFlags.Exportable);`
`35`		`- var serverCertificate = new X509Certificate2(export.ServerCertificatePfx, (string?)null, X509KeyStorageFlags.Exportable);`
	`34`	`+ var caCertificate = X509CertificateLoader.LoadPkcs12(export.CaCertificatePfx, null, X509KeyStorageFlags.Exportable);`
	`35`	`+ var serverCertificate = X509CertificateLoader.LoadPkcs12(export.ServerCertificatePfx, null, X509KeyStorageFlags.Exportable);`
`36`	`36`
`37`	`37`	`return new TlsCertificateChain(caCertificate, serverCertificate, export.SansHash, export.Version);`
`38`	`38`	`}`