未验证 提交 9639739f 编写于 作者: J Jeremy Barton 提交者: GitHub

Try to make tooling happier. (#74196)

上级 4f7a096d
......@@ -7,7 +7,7 @@
"src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/DSA/DSAKeyPemTests.cs",
"src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/EC/ECKeyPemTests.cs",
"src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSAKeyPemTests.cs",
"src/libraries/System.Security.Cryptography.X509Certificates/tests/TestData.cs"
"src/libraries/System.Security.Cryptography/tests/X509Certificates/TestData.cs"
],
"placeholder": [
"-----BEGIN PRIVATE KEY-----",
......
......@@ -101,7 +101,7 @@ public static void ExportAsPfxVerifyPassword()
using (X509Certificate2 c1 = new X509Certificate2(TestData.MsCertificate))
{
byte[] pfx = c1.Export(X509ContentType.Pkcs12, password);
Assert.ThrowsAny<CryptographicException>(() => new X509Certificate2(pfx, "WRONGPASSWORD"));
Assert.ThrowsAny<CryptographicException>(() => new X509Certificate2(pfx, "PlaceholderWrongPassword"));
}
}
......@@ -116,7 +116,7 @@ public static void ExportAsPfxWithPrivateKeyVerifyPassword()
byte[] pfx = cert.Export(X509ContentType.Pkcs12, password);
Assert.ThrowsAny<CryptographicException>(() => new X509Certificate2(pfx, "WRONGPASSWORD"));
Assert.ThrowsAny<CryptographicException>(() => new X509Certificate2(pfx, "PlaceholderWrongPassword"));
using (var cert2 = new X509Certificate2(pfx, password))
{
......
......@@ -147,7 +147,7 @@ public static void ExportWithPrivateKey(X509KeyStorageFlags keyStorageFlags)
{
using (var cert = new X509Certificate2(TestData.PfxData, TestData.PfxDataPassword, X509KeyStorageFlags.Exportable | keyStorageFlags))
{
const string password = "NotVerySecret";
const string password = "Placeholder";
byte[] pkcs12 = cert.Export(X509ContentType.Pkcs12, password);
......@@ -163,6 +163,7 @@ public static void ExportWithPrivateKey(X509KeyStorageFlags keyStorageFlags)
[MemberData(nameof(StorageFlags))]
public static void ReadECDsaPrivateKey_WindowsPfx(X509KeyStorageFlags keyStorageFlags)
{
// [SuppressMessage("Microsoft.Security", "CSCAN0220.DefaultPasswordContexts", Justification="Legacy Test Data")]
using (var cert = new X509Certificate2(TestData.ECDsaP256_DigitalSignature_Pfx_Windows, "Test", keyStorageFlags))
{
using (ECDsa ecdsa = cert.GetECDsaPrivateKey())
......@@ -175,6 +176,7 @@ public static void ReadECDsaPrivateKey_WindowsPfx(X509KeyStorageFlags keyStorage
[Fact]
public static void ECDsaPrivateKeyProperty_WindowsPfx()
{
// [SuppressMessage("Microsoft.Security", "CSCAN0220.DefaultPasswordContexts", Justification="Legacy Test Data")]
using (var cert = new X509Certificate2(TestData.ECDsaP256_DigitalSignature_Pfx_Windows, "Test", Cert.EphemeralIfPossible))
using (var pubOnly = new X509Certificate2(cert.RawData))
{
......@@ -199,6 +201,7 @@ public static void ECDsaPrivateKeyProperty_WindowsPfx()
[MemberData(nameof(StorageFlags))]
public static void ReadECDHPrivateKey_WindowsPfx(X509KeyStorageFlags keyStorageFlags)
{
// [SuppressMessage("Microsoft.Security", "CSCAN0220.DefaultPasswordContexts", Justification="Legacy Test Data")]
using (var cert = new X509Certificate2(TestData.EcDhP256_KeyAgree_Pfx_Windows, "test", keyStorageFlags))
{
using (ECDiffieHellman ecdh = cert.GetECDiffieHellmanPrivateKey())
......@@ -211,6 +214,7 @@ public static void ReadECDHPrivateKey_WindowsPfx(X509KeyStorageFlags keyStorageF
[Fact]
public static void ECDHPrivateKeyProperty_WindowsPfx()
{
// [SuppressMessage("Microsoft.Security", "CSCAN0220.DefaultPasswordContexts", Justification="Legacy Test Data")]
using (var cert = new X509Certificate2(TestData.EcDhP256_KeyAgree_Pfx_Windows, "test", Cert.EphemeralIfPossible))
using (var pubOnly = new X509Certificate2(cert.RawData))
{
......@@ -305,6 +309,7 @@ public static void ReadECDsaPrivateKey_BrainpoolP160r1_Pfx(byte[] pfxData)
[MemberData(nameof(StorageFlags))]
public static void ReadECDsaPrivateKey_OpenSslPfx(X509KeyStorageFlags keyStorageFlags)
{
// [SuppressMessage("Microsoft.Security", "CSCAN0220.DefaultPasswordContexts", Justification="Legacy Test Data")]
using (var cert = new X509Certificate2(TestData.ECDsaP256_DigitalSignature_Pfx_OpenSsl, "Test", keyStorageFlags))
using (ECDsa ecdsa = cert.GetECDsaPrivateKey())
{
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册