Fix net5.0 tests on OSX

heaths · Mar 22, 2021 · 3f33aeb · 3f33aeb
1 parent 5d45d3f
commit 3f33aeb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 30 deletions.
diff --git a/sdk/keyvault/Azure.Security.KeyVault.Certificates/tests/LightweightPkcs8DecoderTests.cs b/sdk/keyvault/Azure.Security.KeyVault.Certificates/tests/LightweightPkcs8DecoderTests.cs
@@ -18,7 +18,7 @@ public class LightweightPkcs8DecoderTests
         [Test]
         [Ignore("Temporarily disable until https://github.com/Azure/azure-sdk-for-net/pull/19612")]
         public void VerifyECDecoderPrime256v1Imported() =>
-            VerifyECDecoder(EcPrime256v1PrivateKeyImported, CertificateKeyCurveName.P256K, @"DFTTJrKrtao7G/B0bK5yv+mX0/3Sefv2MS1gzd6DfYH2ASe9Tw7rSbLjZ8wM0p7I/opbIG1+zHhpYqOGnQNQyw==", EcPrime256v1CertificateImported);
+            VerifyECDecoder(EcPrime256v1PrivateKeyImported, CertificateKeyCurveName.P256, @"DFTTJrKrtao7G/B0bK5yv+mX0/3Sefv2MS1gzd6DfYH2ASe9Tw7rSbLjZ8wM0p7I/opbIG1+zHhpYqOGnQNQyw==", EcPrime256v1CertificateImported);
 
         [Test]
         public void VerifyECDecoderSecp256k1() =>

diff --git a/sdk/keyvault/Azure.Security.KeyVault.Certificates/tests/PemReaderTests.cs b/sdk/keyvault/Azure.Security.KeyVault.Certificates/tests/PemReaderTests.cs
@@ -104,10 +104,8 @@ public void LoadECDsaPrime256v1Certificate()
         {
 #if NET461
             Assert.Ignore("Loading X509Certificate2 with private EC key not supported on this platform");
-#elif NETCOREAPP2_1
-            Assert.Ignore("Different OIDs in the certificate and private key prevent this from passing currently");
 #endif
-            using X509Certificate2 certificate = PemReader.LoadCertificate(ECDsaPrime256v1Certificate.AsSpan(), keyType: PemReader.KeyType.ECDsa);
+            using X509Certificate2 certificate = PemReader.LoadCertificate(s_ecdsaFullCertificate.AsSpan(), keyType: PemReader.KeyType.ECDsa);
             Assert.AreEqual("CN=Azure SDK", certificate.Subject);
             Assert.IsTrue(certificate.HasPrivateKey);
         }
@@ -180,32 +178,6 @@ public void LoadECDsaPrime256v1Certificate()
 lkApwUZg00+9hRWxv0DTh/mRS2zu5i/9W+cZbIcRah0JHgOzAjvsyY9RHjqZ9r7c
 Md7RrFHxnAKJj5TZJJJOf5h3OaaF3A5W8gf9Bc68aGQLFT5Y2afIawkYNSULypc3
 pn29yMivL7r48dlo
------END CERTIFICATE-----";
-
-        private const string ECDsaPrime256v1Certificate = @"
------BEGIN PRIVATE KEY-----
-MIIBMgIBADCBrgYHKoZIzj0CATCBogIBATAsBgcqhkjOPQEBAiEA////////////
-/////////////////////////v///C8wBgQBAAQBBwRBBHm+Zn753LusVaBilc6H
-CwcCm/zbLc4o2VnygVsW+BeYSDradyajxGVdpPv8DhEIqP0XtEimhVQZnEfQj/sQ
-1LgCIQD////////////////////+uq7c5q9IoDu/0l6M0DZBQQIBAQRtMGsCAQEE
-INIX6ZEliNAwvZAq3GkJHNHSvQOlIzFMkifg/C8DfVAhoUQDQgAEnxIn+jXd3Pfw
-IcpGkQx9b1L/BYXHDzNINDOTwmOku3fG+zI6vT3R3VkHfcd7GR9aJxp1tdxMnIkF
-xU2Z1eNVXqANMAsGA1UdDzEEAwIAgA==
------END PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIICPzCCAeWgAwIBAgIQdclPKrRQTmCpZ0p2lM2pmDAKBggqhkjOPQQDAjAUMRIw
-EAYDVQQDEwlBenVyZSBTREswHhcNMjEwMzAzMDEwOTIxWhcNMjIwMzAzMDExOTIx
-WjAUMRIwEAYDVQQDEwlBenVyZSBTREswgfUwga4GByqGSM49AgEwgaICAQEwLAYH
-KoZIzj0BAQIhAP////////////////////////////////////7///wvMAYEAQAE
-AQcEQQR5vmZ++dy7rFWgYpXOhwsHApv82y3OKNlZ8oFbFvgXmEg62ncmo8RlXaT7
-/A4RCKj9F7RIpoVUGZxH0I/7ENS4AiEA/////////////////////rqu3OavSKA7
-v9JejNA2QUECAQEDQgAEnxIn+jXd3PfwIcpGkQx9b1L/BYXHDzNINDOTwmOku3fG
-+zI6vT3R3VkHfcd7GR9aJxp1tdxMnIkFxU2Z1eNVXqN8MHowDgYDVR0PAQH/BAQD
-AgeAMAkGA1UdEwQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8G
-A1UdIwQYMBaAFAJEtqOacY6KuA8KAyt3dgByxWGlMB0GA1UdDgQWBBQCRLajmnGO
-irgPCgMrd3YAcsVhpTAKBggqhkjOPQQDAgNIADBFAiEAlGVRNxgGsOpmBAGud2v1
-aSnz2Zm8A9EV1a+5EVp8Rz8CIFkJYAXOL/n0xo4fp+7yR+9SwVa3c6wNimYSfhoU
-+YpQ
 -----END CERTIFICATE-----";
 
         private static readonly string s_ecdsaFullCertificate = ECDsaPrivateKey + ECDsaCertificate;