Skip to content

Commit 02b6cfc

Browse files
joshuajyueCopilot
andcommitted
Replace SHA-1/RSA-1024 test data with SHA-256/RSA-2048 equivalents
Platforms that enforce a strict crypto policy (e.g. CentOS Stream 10, Fedora 44) reject SHA-1 signatures and RSA keys smaller than 2048 bits, causing 29 tests in System.Security.Cryptography.Pkcs to be skipped behind [ConditionalFact(SupportsRsaSha1Signatures)]. This change replaces the pre-built test documents and the certificates used to produce them with SHA-256 / RSA-2048 equivalents, reducing the number of conditionally-skipped tests from 29 to 3. The three remaining skips are intentional: - AddCounterSigner_ECDSA_Sha1: deliberately tests SHA-1 ECDSA behavior - CheckNoSignatureDocument: uses a NoSignature primary signer that .NET Framework cannot reproduce (NullReferenceException in crypt32), so no SHA-2 twin can be generated New test documents were generated using .NET Framework (net481), which is a thin wrapper over crypt32, so the output carries the Windows-native encoding (counter-signers include a ContentType signed attribute, as crypt32 emits). Co-authored-by: Copilot <[email protected]> Copilot-Session: 53916e59-38f7-4bcf-beba-f9662df3975b
1 parent 34a3c5d commit 02b6cfc

7 files changed

Lines changed: 655 additions & 169 deletions

File tree

‎src/libraries/System.Security.Cryptography.Pkcs/tests/Certificates.cs‎

Lines changed: 53 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -406,55 +406,59 @@ private static class RawData
406406
+ "5a5e17df9785976e9031dd96134a07899281b6b64e3f").HexToByteArray();
407407

408408
public static byte[] s_RSA2048Sha256KeyTransfer1Pfx =
409-
("308209710201033082093706092a864886f70d010701a08209280482092430820920308203c706092a864886f70d010706a0"
410-
+ "8203b8308203b4020100308203ad06092a864886f70d010701301c060a2a864886f70d010c0106300e04081681e2854fdf32"
411-
+ "7702020800808203807561ee3de7d54036ba61f41f76155bd406cd909358a12db40e07698863cc1143c77becf6dcb87a4a8a"
412-
+ "701c8ff59021431a98ff6193c6d36e3bd7d11806c788042bc6f5dbceede60a1d6a314300ceca09b571e1a7842db92e19185b"
413-
+ "e2408db8458d3e9127096b1f8a8c493aebc22bdfeb48bcd6d592b9db1d075fc7468cae8bf5bc01a0fa93bb2047981c5a4e23"
414-
+ "f8c8e7795b1f94f5fbe2dbd03578ae2cdf13560bb73c219d258919f002217cb15a8b6e037da01c1de49b4c699c74c5396cf8"
415-
+ "67bb308026c3a6b85da079de0aedecea0770a6b76128d185fc94a955789f3f26ffb99689b7311c7619ad24a33c6be16e022b"
416-
+ "7216de49e1f11c9b4ded79aa438f535dbdb8bcc9f58ed2b3cd62515c5742f5e2ae0e9f791b83d4ebba5b3766e10194ae27f0"
417-
+ "68960d039777c5ce71b11da9a4c791f612e06cddd2e474cfb8bda95faf88f6a854c26f6c787d20db07aa777f6ec2c208760c"
418-
+ "67cb51cc5c79e13ba2760013d4ff54ab33a0aff355fea7aabd607a4fd8449d16173249be6785be5fa2e415932b6be65b483c"
419-
+ "718e151e820bb4930f7df183cfa8c4a88b989a133ddb1717ea5b73f0950bf485de09d335347a16b96f02a4417e3671856c19"
420-
+ "8b45462a21ce0df8f8e4c5178aae1999dc936aff91512ef9b7667de37e924118a6e958b111bf33088938987136143fa28ec7"
421-
+ "216f77f4fecf87cfe3cd6af4d73a2e544d2f24a915de8d619faf0a4b891f09a9365bdd6dc48bc1eed864354e84c1bf0bc9dd"
422-
+ "99a9e1280f6c81501424700960209ce0da9fd9e1b462d06673bb041439c8726f2b8890b90e859f717478637594675299c29c"
423-
+ "da3f2dc6b6b9f1b72befc542407f180c89204774965c277fec78905b14b0ba54d19a9e8c3eb9c6ec6d056773a248908a6483"
424-
+ "de20539b75de610c4ebdc77dc3a903a7e00fb1f6f46bfc97fe08a75b9d82bc4c536e4c71cf7c88d2eb57c50a97278ea5a254"
425-
+ "1c5ee418f2aeccf800dd1dee31aacb4e6c679c58400757817a08ad7ec12e128f2e177bf2870d68c6d9fb4b2987abee13bfc1"
426-
+ "7b529dd00edc8eea55fc8268e02dcbd84e7cb2cfe1ae8d4c1fb0a486871e18ddde79759ad0127e5dac938a105aaee9368901"
427-
+ "186c149424ec992b57fe927b1f6c35142229e3d427a0d86d454d302c3cf4fa4f1b75c42813e8029a1428570aa1903acde079"
428-
+ "6d0d2259780bf4752a70788fc642c372009f57cd430ee2edc01954e5a615744e7cd3bd8784e3c3b80b0b63847464207f92ec"
429-
+ "821dd564f43082055106092a864886f70d010701a08205420482053e3082053a30820536060b2a864886f70d010c0a0102a0"
430-
+ "8204fe308204fa301c060a2a864886f70d010c0103300e04084dcda62e7b3f05f602020800048204d87345553aefe9a5c6d8"
431-
+ "488c069190343bd43adcb7a3058066b12b01f58d238b517627b440b704a1944955c4f97b59eb0bafb4d6ea35f6d931773013"
432-
+ "e0202a1229659ab32469edd459a7712757457a5a967af3a4328d772a87ca46076c76dcbcb3671be555969826e1f94d2879be"
433-
+ "9f464bca6d970cc31ac485ff50d2f055a1cf1cfe1aa0a14e166a85bf27c9d5f8d2ba876e54d737936a6f5f61d6e2dd7cf4e1"
434-
+ "3bd34e397809cf62de6d793944d37c82b180bf98d1ffd7b345174883864fd31b80fb598ba4eb63c1f7ca9c676ec0c38f2306"
435-
+ "7329f63b28ca0dd17f0f78caa00d1953d818bf198f769095ed84a8fa50888ee3327ffcd2eb508545dc961435ced61d5af9d9"
436-
+ "7cdae7fa44ab658ecbf7bc4656deb32cdb8fbf45538c21d653f89cdeed08f84a732cd1a9f3f5d27231daf06fb80e8521dec5"
437-
+ "51331466c851d133648e9ed978aca042d66a8dd224b6bd3ebd861302c1c096247a193beb6fc37a50c6b79e3751bf68b4bf45"
438-
+ "2ff71bfa07ae20d22d3003c92bd1f7907850c0a689ed2ed15466f23e164d5356cf8c0fdf22c109e2de5178a3e58216402f6a"
439-
+ "ffffd911924dfebe0d771b4056399753972ed7006f0e89ca0a6e256c8d439c0199bc2407e2ddadf820edb464cee1cf059d9a"
440-
+ "eae490493dcbc3c59c1bdcc70059a636a6d6092fe554efb616bcf653b4d673e025569fc95218ce99aa48bd01832f76739f30"
441-
+ "05ddb6616e0f42cf236f30aacd261afd567765b5b2e8363d94e871f32755b8b2a9170d40ecfe497f88c4287550df80a9b802"
442-
+ "2560d6137f6f4641c8479535e4f2c2f66f60843623f30a8201422c797b7ba8df24440249571203eacc6d362c2c87c417f854"
443-
+ "dc64194e8e8566a414bb32d2eb8a316296286ed36767bdc34c97ee9d891c6d28453b1e83a525b8dcddcb20510c913acea8e3"
444-
+ "3053784a36097f8cd2984c8ee6623c1e0875046769cda607cba996417ee97b788819e476425a9b5369bd8affcc867c5974ba"
445-
+ "639a5c2d1ad33d63776a06b040e364233e9407f7004200fe1716a55ca6871f5e68033a8c0b5d1392df55f39ee2c751bcacc5"
446-
+ "3c8347870e453c2fa4e0abbf3ed9a668bdb2839ca9529292a9545db18af6d0213d67fca687d164a7fce7a7c1482f3788bf8e"
447-
+ "77e5d820f75a975e3b4b00a4ee9d2a21cb4eb81c5e31a48d82f7c09b92eff40a83dc0e5528c2f90442ef85e47e3af680ac74"
448-
+ "4117add8582e293b78d078f0f07307453be0e7a64ff9cae27eb51fb14eb5b8760643ad1204b352a9a9772f419f92a37a0ce9"
449-
+ "2f002b5a34b97bbd9df209a090df38fe67244fd01e19b92fa881d00b70c6083480c12483a2fe1103c1c12f3148819728ce30"
450-
+ "11678d6711452bda6163911d2c29168f3e915f3b7e9afc6fa8b7d1e21c32db0252f784f33341b87107af7c783a05270ef2de"
451-
+ "48175e147683e515fa97f4d3fe8dd77b1d4e24e6049fbf1ed9d08d0dc6b2be65554ba116b25e3cb1462f3aaf1fbd60624909"
452-
+ "a579a726f6176552000e84ab323a88f23a630985685e3aeb0b08c9f027f717257c595d053f257d6e5f2ecfd30903bdc35868"
453-
+ "f4b20f86938102d22c782713e3ea01d67bfa0ecea9668b6b15de3198adb4e87e438634cb3fa3ea7e2c195d9616dd2b42e107"
454-
+ "3e29e94dc9067f2794f25f8a78108db5c99a51298353cb7c1c0352d76f19ea6222e03836cc7bcf9f8873b07d4e0ba845b3f2"
455-
+ "f19eb36e9cc8215f28f2b911f772d4330340fbb6f8cc1840241720074c0c743125302306092a864886f70d01091531160414"
456-
+ "c6fe1078ea0dbc7c8d7f96ad3b7157625c8aab8c30313021300906052b0e03021a05000414bd17b7ccb644846ca45544381e"
457-
+ "b780abf0ccc2650408e4b108ac25f3820e02020800").HexToByteArray();
409+
("30820a28020103308209e406092a864886f70d010701a08209d5048209d1308209cd3082060606092a864886f70d010701a0"
410+
+ "8205f7048205f3308205ef308205eb060b2a864886f70d010c0a0102a0820506308205023024060a2a864886f70d010c0103"
411+
+ "30160410d037d9a7d08cb7cf6a23ed66656556a4020207d0048204d8af0e3d0bdf6766f8b3001818fd06535134735a9e2bae"
412+
+ "23904c971c4899807540d4332179d13796f5cf4b9afc45ab18c0602602d78aaea18fedf9c32239fa707b98cd30ba9649724e"
413+
+ "50c9bb49682554193a143171d3a29be09e6d9d175bb2fba8cf7ae560ec84306e89c5abeeec935e4b3df028da5a9fb47de280"
414+
+ "991d9c3c4b7841673bf28ecc27bbfce6451049acfecccb0935fc0594685470655f92b8632ee4b2beab923e89313d5c47b77e"
415+
+ "4c94bc429dad8fa2c8426ba2ee479976cefd4e407f2a58df7dae7de5215cb161bb4fdcb0a6320359842eb7af18b101abeb7f"
416+
+ "b21707fdb8b5674c2ec594fc58410467cdf3275b6eb4f20d95361638c9e52b31075fb55824a9d47ccf601c121ed799eaf6af"
417+
+ "b91efeb570c6d8793181b05f2a864c5bbeadb89e37eda9df55c956a2dee088f21f8f8c99ce577c889e0e367a33f0b840062f"
418+
+ "f601f6908a3c139af03ecd8958b8ddac641ff00d229f03660f8b2f90e61265cf5646e8f34cb31332ddf9f7f5f022e2430977"
419+
+ "9fdd295bdba6001e9baa1810ff577b4ff680bf15462a4a5605d6dd65f56c7d9ebfe333eadaeb2018a49a6102618cdbf46b51"
420+
+ "f9862c085c1e50cd9fc7df1eab8e2cb2e59c303d213dbe98d8f80131a395c480a7c27f42d1902bf9d966a3687b9de98d3712"
421+
+ "46c2b23502dbc334a997c56f76a17b68196557834cac7c880315c522ebbedceb66f98694e3192f15ab824d2b92b39fdf83d8"
422+
+ "afb4bf56a33fd12d89c6ea0161ba844707579d52cd88d13ccef1de78172c2c07c16928e222dd4ed5d6fa7fa240b7e5aa6b50"
423+
+ "ac995a4af5494070639e6cba82cb5abaff74d707ef44c5e43ce26004e5453bf6e18f24d4871e62aacbab45f5e9dff125490b"
424+
+ "feda0796fb0ee615f28825deb617cfb626e6238ce8fd8210347a40364b9e54a0bbb5215f650005dc10c056b79d9a6f59a2d1"
425+
+ "cfefb9cba0f90de0eb53f4a651c1b37cecf17be341f4194de23f5d61122aeaa9d2547c44ef100068b98508737a69ec14de5c"
426+
+ "072595396d4ac4a7f278c8c171d16055f02b14a7ca1bf20a6a24f4aeb8ea79e7854b8118f52c89b5a4df2db5d57f71200f2a"
427+
+ "514423bc22861c978bfe61263ada5f1b9b111818c011246ec6fc8a23901cde7f126bbd60bd1826f780b81f7ea3836eed6ad0"
428+
+ "2b081b92fe14812e715bac0b6fdcceb266e525d8d1d97c638272f261e2342adc663637a36b614b171690bf564c76b60f245e"
429+
+ "58e4b8cfd751755524c5ef7f968a2f2f76a990b8122907872b7a8d6585193b17042f87f3fabe7d085e996d354606633f9f0d"
430+
+ "c9cbf5bfb05cf6defc8738e1ab2b7b0d89712435ff80cdc16d1b13c70b3903c369c59436545781b6e3dcb16b9fe161f55aab"
431+
+ "d922a429fdcd5a17f6d794a61db5d4af8c2c260e894a8b052701b70c8d7ffb34b26e14422e8011d682b625b6872b21b8a3f0"
432+
+ "3ab10943ecb4865ba5b80c74339e6a42c1afcd7d7435b93f28544465940257e440a90992d96a50f12ffb4806fe5affadff1c"
433+
+ "83f0b21623f6687a022ad7d48a312373a6344d96fa0f2aa99c1acdf7e227b2db4e709fc6c6c7fcc7b35bb408313348f37b0f"
434+
+ "5366af4a74089431fb8474de5060c31078eca810db943618688e7c38639e9a3e0519a0a5ab80452cefb93e0500ebeea64481"
435+
+ "4b423ff84a948d22e95136005792260ab4b0cd0e16b5eec47e0bf8953608a6dc96ba42d5959889a69321e5b6fde775c616e3"
436+
+ "15ef317660cc780477c40bcdbf3837b82b853181d1301306092a864886f70d0109153106040401000000305b06092a864886"
437+
+ "f70d010914314e1e4c007b00450043004100330036003900430039002d0034003500440039002d0034003200310044002d00"
438+
+ "41004100380033002d003500360030003300410031003600350034004100390031007d305d06092b06010401823711013150"
439+
+ "1e4e004d006900630072006f0073006f0066007400200053006f0066007400770061007200650020004b0065007900200053"
440+
+ "0074006f0072006100670065002000500072006f00760069006400650072308203bf06092a864886f70d010706a08203b030"
441+
+ "8203ac020100308203a506092a864886f70d0107013024060a2a864886f70d010c0103301604105052392755b8468481bfef"
442+
+ "eaaf92ed8d020207d0808203702804689d194f5d39b7b2e207169f39e0c932270351f98b3db7210a89d5dbbe2c5872933d42"
443+
+ "838bc5252b60386827ce1fc08f986f0dcc3384ffc7f85f67186edba40eb514388b2f7bfbf68f0b0bd091468c9325db4c6e98"
444+
+ "55e7175a27ecce97d9f24c2257d3dc8d9e84fe592987fcd5876a9ca13ca8acceef08d01ac50c644978eaffdaacfb6e52b25a"
445+
+ "91c415c06153df569d4796ed12dbb3d0765bf9ae9d17d1d47454dd0cf57441c38f46b8e17d7c2bdde51bb9835a71aaaf2099"
446+
+ "639b68fd5a442047d9a1fa156cf944b5c2f12dbb9b137a2ebc626d9cae55113b0788a50ba489ea2f5cc6e9f48ce6c079afda"
447+
+ "8678e873eb175eec8dd23d2b04ec96fd21ec68819513daefe3330b6fda2c72de9e5675d5dac51ecba05c2c95838cf1cfca1b"
448+
+ "d24f95e73d4b54e3677d76c3eeb1a8e01a678f3b0d8050dec41341eb96f8409cb6358b71d14c74a0b5ad6a84569cf3a75cce"
449+
+ "b892bf66e46db22b6af6f6fdaf8eb5683700e35bf83f5bfbad116c9681b6076c8160d5dc2a636c7d033843d1a8235c75ce06"
450+
+ "290200b76ea9590834968ffaccfc812f006d2024d2d14b2b1a281169b3db35638f5850dc4c6f847eb24b8ec543c3808b934b"
451+
+ "c460833b5df61dd0866c4a0105be9ca4af8d053a0850e511f08be5a8b75e10cd6c8e193de14d50fc1766c3fbc716e7635ee0"
452+
+ "e53dcd21e0fd7f09b5ce0bb0297e67a260337016b1dd93087ba382055f5c122aa043559d9f4a7ad1f91436164b3b5e38b181"
453+
+ "6e42298fc16ce2d9351b6e6a673a531c6113d71256586fa8b30b55912ac39adda3b76ee382222cac35dff3402de0b67c4b70"
454+
+ "2f88dd3eaf54d66379bac66ebf6e4124a1b09d3fafd4fb282cf8cbc721c746f37228b514ac61efa4c91a5fecece1546c1fa7"
455+
+ "fdf3b2e34be63f876027d3c8190f9dd5949aecb95eb59f27a397fa5bdfcb612309ebe13be8e5fd160795a0b6b8d352d96213"
456+
+ "f233b68e332c6b4bac42290ee6a6add2b108d4e78a37e94c4b625eeb186d196d31e35b3867b47bed05adf86800338c45999d"
457+
+ "502918e7b4cb97edc0ce8827c882890c2c4e9d4ae9cd3846b288e2c64f927c5b0dbdb5c1d7d4cded4c795f6ea6f7a7d73d44"
458+
+ "ac48bac4e56f798f116ba0139ebf399362243fa34fb6cbc752a84bcb99242c229ff7d993ac43a1c6ded036a7bd804882bcdf"
459+
+ "1e51e00c0fc0958dd687ec8494828cc3110feca2c5b3b1d8f039b7bb9798da562f715a5861b071da748fc6303b301f300706"
460+
+ "052b0e03021a041469d143ba1fdbadfdafcd3de33414f180c7a0f7a404143828edf49b76cbafd406cc151e0e7861541d5b83"
461+
+ "020207d0").HexToByteArray();
458462

459463
public static byte[] s_DHKeyAgree1Cer =
460464
("3082041930820305a00302010202100ae59b0cb8119f8942eda74163413a02300906052b0e03021d0500304f314d304b0603"

‎src/libraries/System.Security.Cryptography.Pkcs/tests/SignatureSupport.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ public class SignatureSupport
1111
public static bool SupportsRsaSha1Signatures { get; } =
1212
System.Security.Cryptography.Tests.SignatureSupport.CanProduceSha1Signature(RSA.Create());
1313

14+
public static bool SupportsEcdsaSha1Signatures { get; } =
15+
System.Security.Cryptography.Tests.SignatureSupport.CanProduceSha1Signature(ECDsa.Create());
16+
1417
public static bool SupportsRsaMd5Signatures { get; } =
1518
System.Security.Cryptography.Tests.SignatureSupport.CanProduceMd5Signature(RSA.Create());
1619
}

‎src/libraries/System.Security.Cryptography.Pkcs/tests/SignedCms/SignedCmsTests.cs‎

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -192,11 +192,11 @@ public static void Ctor_NoContent_Throws()
192192
() => new SignedCms(SubjectIdentifierType.SubjectKeyIdentifier, null, true));
193193
}
194194

195-
[ConditionalFact(typeof(SignatureSupport), nameof(SignatureSupport.SupportsRsaSha1Signatures))]
195+
[Fact]
196196
public static void CheckSignature_ExtraStore_IsAdditional()
197197
{
198198
SignedCms cms = new SignedCms();
199-
cms.Decode(SignedDocuments.RsaPkcs1OneSignerIssuerAndSerialNumber);
199+
cms.Decode(SignedDocuments.RsaPkcs1Sha256OneSignerIssuerAndSerialNumber);
200200

201201
// Assert.NotThrows
202202
cms.CheckSignature(true);
@@ -205,10 +205,10 @@ public static void CheckSignature_ExtraStore_IsAdditional()
205205
cms.CheckSignature(new X509Certificate2Collection(), true);
206206
}
207207

208-
[ConditionalFact(typeof(SignatureSupport), nameof(SignatureSupport.SupportsRsaSha1Signatures))]
208+
[Fact]
209209
public static void Decode_IgnoresExtraData()
210210
{
211-
byte[] basis = SignedDocuments.RsaPkcs1OneSignerIssuerAndSerialNumber;
211+
byte[] basis = SignedDocuments.RsaPkcs1Sha256OneSignerIssuerAndSerialNumber;
212212
byte[] data = new byte[basis.Length + 60];
213213
data.AsSpan(basis.Length).Fill(0x5E);
214214
basis.AsSpan().CopyTo(data);
@@ -1233,11 +1233,11 @@ public static void EnsureExtraCertsAdded(bool newDocument)
12331233
cms.CheckSignature(true);
12341234
}
12351235

1236-
[ConditionalFact(typeof(SignatureSupport), nameof(SignatureSupport.SupportsRsaSha1Signatures))]
1236+
[Fact]
12371237
public static void UntrustedCertFails_WhenTrustChecked()
12381238
{
12391239
SignedCms cms = new SignedCms();
1240-
cms.Decode(SignedDocuments.RsaPkcs1OneSignerIssuerAndSerialNumber);
1240+
cms.Decode(SignedDocuments.RsaPkcs1Sha256OneSignerIssuerAndSerialNumber);
12411241

12421242
// Assert.NoThrow
12431243
cms.CheckSignature(true);
@@ -1542,20 +1542,22 @@ public static void SignIdentifiedContent_BadOid(string? oidValueIn, string conte
15421542
Assert.Equal(contentHex, signedCms.ContentInfo.Content.ByteArrayToHex());
15431543
}
15441544

1545-
[ConditionalFact(typeof(SignatureSupport), nameof(SignatureSupport.SupportsRsaSha1Signatures))]
1545+
[Fact]
15461546
public static void CheckSignedEncrypted_IssuerSerial_FromNetFx()
15471547
{
15481548
CheckSignedEncrypted(
1549-
SignedDocuments.SignedCmsOverEnvelopedCms_IssuerSerial_NetFx,
1550-
SubjectIdentifierType.IssuerAndSerialNumber);
1549+
SignedDocuments.SignedCmsOverEnvelopedCms_IssuerSerial_Sha256_NetFx,
1550+
SubjectIdentifierType.IssuerAndSerialNumber,
1551+
Certificates.RSA2048Sha256KeyTransfer1);
15511552
}
15521553

1553-
[ConditionalFact(typeof(SignatureSupport), nameof(SignatureSupport.SupportsRsaSha1Signatures))]
1554+
[Fact]
15541555
public static void CheckSignedEncrypted_SKID_FromNetFx()
15551556
{
15561557
CheckSignedEncrypted(
1557-
SignedDocuments.SignedCmsOverEnvelopedCms_SKID_NetFx,
1558-
SubjectIdentifierType.SubjectKeyIdentifier);
1558+
SignedDocuments.SignedCmsOverEnvelopedCms_SKID_Sha256_NetFx,
1559+
SubjectIdentifierType.SubjectKeyIdentifier,
1560+
Certificates.RSA2048Sha256KeyTransfer1);
15591561
}
15601562

15611563
[Fact]
@@ -1590,7 +1592,10 @@ public static void ReadAndWriteDocumentWithIndefiniteLengthContent(bool checkSig
15901592
cms.Encode();
15911593
}
15921594

1593-
private static void CheckSignedEncrypted(byte[] docBytes, SubjectIdentifierType expectedType)
1595+
private static void CheckSignedEncrypted(
1596+
byte[] docBytes,
1597+
SubjectIdentifierType expectedType,
1598+
CertLoader? decryptionCert = null)
15941599
{
15951600
SignedCms signedCms = new SignedCms();
15961601
signedCms.Decode(docBytes);
@@ -1607,7 +1612,7 @@ private static void CheckSignedEncrypted(byte[] docBytes, SubjectIdentifierType
16071612
EnvelopedCms envelopedCms = new EnvelopedCms();
16081613
envelopedCms.Decode(signedCms.ContentInfo.Content);
16091614

1610-
using (X509Certificate2 cert = Certificates.RSAKeyTransferCapi1.TryGetCertificateWithPrivateKey())
1615+
using (X509Certificate2 cert = (decryptionCert ?? Certificates.RSAKeyTransferCapi1).TryGetCertificateWithPrivateKey())
16111616
{
16121617
envelopedCms.Decrypt(new X509Certificate2Collection(cert));
16131618
}

‎src/libraries/System.Security.Cryptography.Pkcs/tests/SignedCms/SignedCmsTests.netcoreapp.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -403,11 +403,11 @@ public static void SignCmsUsingSlhDsaCertWithNotMatchingKeyThrows()
403403
}
404404
}
405405

406-
[ConditionalFact(typeof(SignatureSupport), nameof(SignatureSupport.SupportsRsaSha1Signatures))]
406+
[Fact]
407407
public static void AddCertificate()
408408
{
409409
SignedCms cms = new SignedCms();
410-
cms.Decode(SignedDocuments.CounterSignedRsaPkcs1OneSigner);
410+
cms.Decode(SignedDocuments.CounterSignedRsaPkcs1Sha256OneSigner);
411411

412412
int numOfCerts = cms.Certificates.Count;
413413

@@ -422,11 +422,11 @@ public static void AddCertificate()
422422
}
423423
}
424424

425-
[ConditionalFact(typeof(SignatureSupport), nameof(SignatureSupport.SupportsRsaSha1Signatures))]
425+
[Fact]
426426
public static void AddCertificateWithPrivateKey()
427427
{
428428
SignedCms cms = new SignedCms();
429-
cms.Decode(SignedDocuments.CounterSignedRsaPkcs1OneSigner);
429+
cms.Decode(SignedDocuments.CounterSignedRsaPkcs1Sha256OneSigner);
430430

431431
int numOfCerts = cms.Certificates.Count;
432432

@@ -487,11 +487,11 @@ public static void RemoveNonExistingCertificate()
487487
}
488488
}
489489

490-
[ConditionalFact(typeof(SignatureSupport), nameof(SignatureSupport.SupportsRsaSha1Signatures))]
490+
[Fact]
491491
public static void RemoveAllCertsAddBackSignerCert()
492492
{
493493
SignedCms cms = new SignedCms();
494-
cms.Decode(SignedDocuments.CounterSignedRsaPkcs1OneSigner);
494+
cms.Decode(SignedDocuments.CounterSignedRsaPkcs1Sha256OneSigner);
495495

496496
SignerInfo signerInfoBeforeRemoval = cms.SignerInfos[0];
497497
X509Certificate2 signerCert = signerInfoBeforeRemoval.Certificate;

0 commit comments

Comments
 (0)