Fix obsolete method calls

Author: vcsjones

src/AzureSignTool/KeyVaultConfigurationDiscoverer.cs

@@ -64,7 +64,7 @@ public async Task<ErrorOr<AzureKeyVaultMaterializedConfiguration>> Materialize(A
                 }
                 _logger.LogTrace($"Retrieved certificate with Id {azureCertificate.Id}.");
 
-                certificate = new X509Certificate2(azureCertificate.Cer);
+                certificate = X509CertificateLoader.LoadCertificate(azureCertificate.Cer);
             }
             catch (Exception e)
             {

src/AzureSignTool/Program.cs

@@ -563,7 +563,7 @@ private static ErrorOr<X509Certificate2Collection> GetAdditionalCertificates(IEn
                         case X509ContentType.Cert:
                         case X509ContentType.Authenticode:
                         case X509ContentType.SerializedCert:
-                            var certificate = new X509Certificate2(path);
+                            var certificate = X509CertificateLoader.LoadCertificateFromFile(path);
                             logger.LogTrace("Including additional certificate {thumbprint}.", certificate.Thumbprint);
                             collection.Add(certificate);
                             break;

test/AzureSign.Core.Tests/AuthenticodeKeyVaultSignerTests.cs

@@ -22,7 +22,7 @@ public AuthenticodeKeyVaultSignerTests()
         [MemberData(nameof(RsaCertificates))]
         public void ShouldSignExeWithRSASigningCertificates_Sha1FileDigest(string certificate)
         {
-            var signingCert = new X509Certificate2(certificate, "test", X509KeyStorageFlags.EphemeralKeySet);
+            var signingCert = X509CertificateLoader.LoadPkcs12FromFile(certificate, "test", X509KeyStorageFlags.EphemeralKeySet);
             var signer = new AuthenticodeKeyVaultSigner(signingCert.GetRSAPrivateKey(), signingCert, HashAlgorithmName.SHA1, TimeStampConfiguration.None);
             var fileToSign = GetFileToSign();
             var result = signer.SignFile(fileToSign, null, null, null);
@@ -40,7 +40,7 @@ public void ShouldSignExeWithRSASigningCertificates_Sha1FileDigest(string certif
         [MemberData(nameof(RsaCertificates))]
         public void ShouldSignExeWithRSASigningCertificates_Sha256FileDigest(string certificate)
         {
-            var signingCert = new X509Certificate2(certificate, "test", X509KeyStorageFlags.EphemeralKeySet);
+            var signingCert = X509CertificateLoader.LoadPkcs12FromFile(certificate, "test", X509KeyStorageFlags.EphemeralKeySet);
             var signer = new AuthenticodeKeyVaultSigner(signingCert.GetRSAPrivateKey(), signingCert, HashAlgorithmName.SHA256, TimeStampConfiguration.None);
             var fileToSign = GetFileToSign();
             var result = signer.SignFile(fileToSign, null, null, null);
@@ -59,7 +59,7 @@ public void ShouldSignExeWithRSASigningCertificates_Sha256FileDigest(string cert
         [MemberData(nameof(ECDsaCertificates))]
         public void ShouldSignExeWithECDsaSigningCertificates_Sha256FileDigest(string certificate)
         {
-            var signingCert = new X509Certificate2(certificate, "test", X509KeyStorageFlags.EphemeralKeySet);
+            var signingCert = X509CertificateLoader.LoadPkcs12FromFile(certificate, "test", X509KeyStorageFlags.EphemeralKeySet);
             var signer = new AuthenticodeKeyVaultSigner(signingCert.GetECDsaPrivateKey(), signingCert, HashAlgorithmName.SHA256, TimeStampConfiguration.None);
             var fileToSign = GetFileToSign();
             var result = signer.SignFile(fileToSign, null, null, null);
@@ -77,7 +77,7 @@ public void ShouldSignExeWithECDsaSigningCertificates_Sha256FileDigest(string ce
         [MemberData(nameof(ECDsaCertificates))]
         public void ShouldSignExeWithECDsaSigningCertificates_Sha256FileDigest_WithTimestamps(string certificate)
         {
-            var signingCert = new X509Certificate2(certificate, "test", X509KeyStorageFlags.EphemeralKeySet);
+            var signingCert = X509CertificateLoader.LoadPkcs12FromFile(certificate, "test", X509KeyStorageFlags.EphemeralKeySet);
             var timestampConfig = new TimeStampConfiguration("http://timestamp.digicert.com", HashAlgorithmName.SHA256, TimeStampType.RFC3161);
             var signer = new AuthenticodeKeyVaultSigner(signingCert.GetECDsaPrivateKey(), signingCert, HashAlgorithmName.SHA256, timestampConfig);
             var fileToSign = GetFileToSign();
@@ -97,7 +97,7 @@ public void ShouldSignExeWithECDsaSigningCertificates_Sha256FileDigest_WithTimes
         [MemberData(nameof(RsaCertificates))]
         public void ShouldSignExeWithRSASigningCertificates_Sha256FileDigest_WithTimestamps(string certificate)
         {
-            var signingCert = new X509Certificate2(certificate, "test", X509KeyStorageFlags.EphemeralKeySet);
+            var signingCert = X509CertificateLoader.LoadPkcs12FromFile(certificate, "test", X509KeyStorageFlags.EphemeralKeySet);
             var timestampConfig = new TimeStampConfiguration("http://timestamp.digicert.com", HashAlgorithmName.SHA256, TimeStampType.RFC3161);
             var signer = new AuthenticodeKeyVaultSigner(signingCert.GetRSAPrivateKey(), signingCert, HashAlgorithmName.SHA256, timestampConfig);
             var fileToSign = GetFileToSign();

test/AzureSign.Core.Tests/MemoryCertificateStoreTests.cs

@@ -29,7 +29,7 @@ public void ShouldAddCertificate()
         {
             using (var store = MemoryCertificateStore.Create())
             {
-                using (var cert = new X509Certificate2("testcerts\\kevin_jones.cer"))
+                using (var cert = X509CertificateLoader.LoadCertificateFromFile("testcerts\\kevin_jones.cer"))
                 {
                     Assert.Empty(store.Certificates);
                     store.Add(cert);