Fix test PKCS#12 to use SHA1 MAC

Author: vcsjones

src/libraries/Common/tests/System/Security/Cryptography/X509Certificates/TestData.cs

@@ -1815,86 +1815,84 @@ public static SecureString CreatePfxDataPasswordSecureString()
 -----END CERTIFICATE-----");
 
         internal static readonly byte[] ECDsabrainpoolP160r1_Pfx = (
-            "308203E00201033082039606092A864886F70D010701A082038704820383" +
+            "308203D00201033082039606092A864886F70D010701A082038704820383" +
             "3082037F3082029F06092A864886F70D010706A08202903082028C020100" +
             "3082028506092A864886F70D010701301C060A2A864886F70D010C010330" +
-            "0E0408B4E97AC27E891FAD02020800808202589ECCEB38175F8A1261A44B" +
-            "5AE3384A42C9C5ABC04A951CEF0D3B5F1C4C8ABA503A546914C9BD22A5BB" +
-            "23769A05181B2E2FC8E2F79A2C2A20AF719E81D673AD35E160DC4A0B7286" +
-            "B7E7BDA255D1B6F96350CF3393BC35B6F60CF78DEB7AC2FB519296BCAD57" +
-            "626025F4A64650B33D632F585C753A917348885D40943B6C7AF80CE5F610" +
-            "C5BA749714DB51CAA9EED29E2315DC6293EF742D7525AAC7F8F777A0222F" +
-            "9B6C2E0B75047B2D25BB00652FB4A02E24CEB752875842E857B46AF7C6C2" +
-            "F121555F49083F2A902F533740AC1A3BF3D843B0EB42339D9795BCEBB3F7" +
-            "299678E83367720E2A2980010A36BB3255233654CFCA499AAC39405B6D94" +
-            "DD581C7448E7BAD2D1E70ADF33EFAD7A0568E84253C63A1542149507DD1E" +
-            "D429C4D3C18D0E09C40F86095F304FC193AAF869B8027C567277802D5C9C" +
-            "4BD20B7E4BE8721EF38E6B2F4056FD42AD34CFAC52728F9A18465F79E9DA" +
-            "DED0C3F2D00F7788C9B7D139D04D8DB55C2E8B06C81E07D88E1303133103" +
-            "96E1BAC730A44DF654556736AF774BA1E38B25C484A6BC22A456F4C1DAFD" +
-            "96DC4F889CB4D8BF12E54168FC5A14E6B178CBC84C04E281686DEB5626EA" +
-            "FD238ED4592ADA6D1A1A802840422732808E91F9383430B292BA562BAE68" +
-            "44E4CFF01D7F444C49FE7BBC35004ECB4470D309778EF2A9C5085B91BC23" +
-            "D92438F9CC37A74FD4563BFE3513DC9062FA16617D8513C6A4B3592D8CCB" +
-            "92D551E54576CEFFD0277EC7FFCB92952FF3DE19B71A47D8B21FBBD512E8" +
-            "291B294F19518DEBDB16364971B6BB14FE0DFB973E8F55BDFF1E2336ED39" +
-            "5802E6BD3B5A92261AB4472C3255CDA8DB63233081D906092A864886F70D" +
+            "0E040850B5FCB0D5547E970202080080820258DF3C88CE4693C725CE1B17" +
+            "FDF905F061DD48CEC140426C6CA0E3A207D1F47E3F78A30E1635F14D8530" +
+            "1442CDBAEAD48E931EA578DD3F3F51D17CB0CCAC8995D790CA75B520F191" +
+            "D9C3F752B81C574D55BB1C4898B805E29B25A3F08964EA507E63684ACEA0" +
+            "CB7BDC5BE65C0C35B7D70BBE49346A35E77DFF60FFDF71331686DA1C8E61" +
+            "58C79AF052E56A919172DE590D8AB473AA616F7CAED005CEC4A9B1532A3B" +
+            "1B46650F915503BA5211162D32EF4800D45FDFE1B50251A576644C32DB40" +
+            "A6F407157DF7FC1BCF3ADAB42EEAB404B97D5F662D4111333C8319594F1E" +
+            "CFA64B9F66A3B789D0D08C638CDC13D51B64283CA547DEF2A4113B234647" +
+            "5CAEBD082EC8C7D0D41E383D91A8BD8D2891422BB3E0CF51DC0A13FB6AE5" +
+            "5B3CB81B49129B9A0929BAA0F511C67E781668133E37EF0C594B4F8DB9E9" +
+            "A66C3C40618F482335BFACA9F60DB2CD6B1DF97071052C1144661612211F" +
+            "2BC80283DAD1397DA32346556B6EF75C49D6FD725D117F0380C71BCA2EFB" +
+            "8F2184DB15820680471AF4CCB19F88AA3A3C97418A9DC4B69D45A53FF997" +
+            "C80CA29F97F2D6C55A5E45863EB0F7C11E5AA760113AE92E324629647AD2" +
+            "DFC55B7D6DF945BAF402973132EFD397B2CA0F3190D99C2FFB0AE37089AB" +
+            "E0F299A58DE0E4ABA4BF8B460CA3DB256CF52030A718F36372251FFA4763" +
+            "1EF07D1900C959966AB77BE1D517A548AD0299A87592ADA64CBBE309313C" +
+            "CB9E56322FCBD44E679A37195C69E8BF4E0F2D5C6AF2DCCF0FFCF0A5203F" +
+            "F53AAD3F8E4E3E99B606C50F345BCADD227E5BFB282F7DF8A21E55D39B8A" +
+            "F8E760B390974608AF0D933C2D391EEEC5F2593081D906092A864886F70D" +
             "010701A081CB0481C83081C53081C2060B2A864886F70D010C0A0102A081" +
-            "8B308188301C060A2A864886F70D010C0103300E040874FDFF61D344B775" +
-            "020208000468750A7275128636F4A46E94EF43FDDB1508181A5604E2562E" +
-            "F210532E522301ACF8082F7C154FA6AC1BA045EB8C551CE67BAD271FE147" +
-            "59C3DD606AB0E75D4628234A108FB05E54B2EEA558A5F9A65911A82049FC" +
-            "0927F02C80234E5106A321365235E3D502C068C13125302306092A864886" +
+            "8B308188301C060A2A864886F70D010C0103300E04080BC69E72AC929822" +
+            "020208000468242993CA1AF26AF8AFDBE206933C2019127607F5F115B2A0" +
+            "BBE6E2F7DB8049CDB4A5F3B25B0EE2F3903D5173F4E0C0A85BDEBC11409B" +
+            "E181A9858341A2C55728F9E1594DB7B5DD50FF8D425ECE8554C627125818" +
+            "78A4B19C1E1008D006511D9F7D584E51A580BA6C3125302306092A864886" +
             "F70D01091531160414472193B362B056F6D6928EFF4C43FF1EFEB1734E30" +
-            "413031300D060960864801650304020105000420564E94122A4F6D9AD6F9" +
-            "1B12A3DA9F8419B43F4D615F6EFAAB0E5F6FFC7C85A1040887213613C311" +
-            "330202020800").HexToByteArray();
+            "313021300906052B0E03021A05000414960876F4476915F2FDF52427172A" +
+            "9C0BC3D93D190408614B031B29EA17C702020800").HexToByteArray();
 
         internal static readonly byte[] ECDsabrainpoolP160r1_Explicit_Pfx = (
-            "30820511020103308204C706092A864886F70D010701A08204B8048204B4" +
+            "30820501020103308204C706092A864886F70D010701A08204B8048204B4" +
             "308204B03082032F06092A864886F70D010706A08203203082031C020100" +
             "3082031506092A864886F70D010701301C060A2A864886F70D010C010330" +
-            "0E040830CB77979FE07EE902020800808202E8B99940539475703028F07F" +
-            "8C7A3E80742A63D5011786669354F02ACEB88E264F9F28E099B784D6DCA0" +
-            "353FC8ECAE1ABA4A8CA7A98D033D6755849D800CCCCBD4B1D11C93F63B81" +
-            "4734C606E705209A6CC754CF7EAFDD91F7005001AAA6166CF36E9F7D130A" +
-            "1474236A3BB172F8A8907DBFF7962545BCAE476939FD24E870CE51600E4C" +
-            "7E7830060C7084E2A29A6D0A5FB1CDDC95977196DA85E523E9A528EC80A1" +
-            "37A9B22E6C79F900759ACAFFE4484CEED5CFA32F4ECB0B8A97B822375AB4" +
-            "548E011197C66A013EB59B0D3F714DD2CFEC3B78B90F90D0BD350E31A369" +
-            "D4F532751CB2924E49DE29FE1B0501476550BD79CE4A7E4D7AF3852224A2" +
-            "10A19D4C02DFD08F0C22C08AE49942FAC9AEA0CCBB97CB6516DD7E65766F" +
-            "5DB7D8AB122442CD5B4A0CB6086BB5024F93D3939B74236BFD746654034B" +
-            "8CD1AB3919092CA019C05ED0D9B6D03D786BB4E31D9738CABD591731F060" +
-            "70CC63A9852C66BAAE4188A3C151229A197821E37E5B54A1D49F3D04CFCD" +
-            "402ED4550104C5CB2B595F10E4ECA323E2E868B3EA52BE99761E6E54B7F4" +
-            "FABC9B5D8FA01D6003D08B575F433A650B025BCD27D1179DB2C426810A73" +
-            "6FB561E0EB01107D044AFC98C2608E4763A511D4FF5D67C37512A0E4108B" +
-            "62CA01D99E44BF4BDBC4C598B54C34848BE18F7BBFD4723E850DC9E85774" +
-            "14598F3553563F263B572BABFA8BB3C194CD77A975BE9A8A0FB711218A7B" +
-            "17CC88E61FBCD1050269D4FDE188693C64C9A340131DC1A1C22A931C44FC" +
-            "BF16CBFA79A172C2BDACD626496B754446B03666A2F05F67D5B463601DDB" +
-            "7C4FED8E5E5FB142BA9AD3D53B491EEDAD0352A4F3E75DB9D74A508D14B5" +
-            "BB1A76027ACF91E85871AA034567B706C80A3BA6265BD7D60C60B2EF0E1A" +
-            "49AD7E2552EFD8D2C2DEF99F1A04CF1C5D77B203132109A86ACA536861D5" +
-            "3C27D660E2074E75659B28E7871DB69D7762D96103022160ECE2D8616B11" +
-            "AC6C597FF70D14096898117247CC6518FA8DE142682B2037D70D54493E01" +
-            "B3BAEF9CE11F56DCB06249BA7D3082017906092A864886F70D010701A082" +
+            "0E04084B3DF3D6ACE142E302020800808202E89FC726B7C10F091DCA8C8C" +
+            "ED26E69AD73A411BA2228E60B9A7FB9B90F8FBF3AE407BCAD0805C2E9A22" +
+            "2278CD7FDAFC5590A0BC0952D97D5B2C4835D7EB9937C7350A02D69BC9AB" +
+            "939596984C0AC73863DB9CE49B93BF108AA2EF541799C8E556A6A8EB271B" +
+            "30F4517F853E0E08F6D6A316866D1E455C4F33E88A46D80836AED1675B04" +
+            "EC81F9B0DA86F9B0C9FCC6B7B06F6CB804B6874D42CF870DD8EA1AA4D4C3" +
+            "67E6B04146418284740935C7B2C21DD3216B30A031A56A5048B622780FC5" +
+            "28E2AF0D7FA740F9B0208A7854EB7710A0BC7A2161FF21C97D6A3004FBE9" +
+            "B9FA7F2DAFF5B8CDC5B239CE1C232485C59BC49BE0CB9EC19AFEEBF097B0" +
+            "406899F48E79918899EAEE04C684E35EF420878770240966ED7FDF7F235C" +
+            "73F1F722747AB46BD3D9197D459A229A19884ED70B9BEB35E61E183314B3" +
+            "B352C290CF7CFD8B8B83499846FCD03D58CF0B9AE30062DBA4AF9C14D1A2" +
+            "8E0B2D474EB3B40F34721C235D716B850883E1B88ABFB1EF64FF509E8EC0" +
+            "E4607C17CE886877B03D1441482D145EED9F8AE40A8CE3842819E2691FBF" +
+            "EEB22F567CB42F53D5B4D1382FD6C0AFB5792B409EF5B40052FB4FD60C9E" +
+            "95412A8834BB508ADF3263A7CB43A3B05A34B987CBE6DEA8F650D0A36585" +
+            "958BEAD5F27BB23AE1EFF17E499F2FD4E8C1F5658861F8E666F3C8F8EB96" +
+            "29578F4CF930E4427058873E0BB2B5EE8D9027A8918C3389FA1CD3EB67F6" +
+            "06713264325C65DACCB9E800380B554CF266AD2DF987D6AAAA7AC759FAF9" +
+            "6E98F26923F8B3349CF6846E91075233CEDCF9077F037AEDFE20284B5ED1" +
+            "3EAF9D52192F6CFE061D6C28B0B321833169C0C3A6DFB22EA3F2F7A7927B" +
+            "3D96802682B03C548410B3F4862ACE945C62A687A6C08DB60192179D47E2" +
+            "FE7CDA3E7874BD954E84E46E7D3588BE1264E6557D1379C93820A349C7CF" +
+            "97191D8B9776090785C0A836413CA13DD5AE13BC3407582302CC47AD64E0" +
+            "99B0D11A921CF81E17718CF75A1A406FA94BF6E36EFB1116C51DBBF1BB73" +
+            "22AAE9D5A259FFE6F7AA15DC563082017906092A864886F70D010701A082" +
             "016A04820166308201623082015E060B2A864886F70D010C0A0102A08201" +
-            "2630820122301C060A2A864886F70D010C0103300E0408F7E5D33CE83FF7" +
-            "1202020800048201002AB3622B331974D59746E41AF87B88F90D919148B5" +
-            "E8A843675AE7F5325BC0AAB0D9E2F9114883445564D2C7E4209F484B0D49" +
-            "BC94009A93CFEF9BC57377D04D58F8E955ABA4D12BA143D8B470D554DED4" +
-            "AE61FE529385DF50D21A6D2F222D4AD965A589D3EC7457F87B796A4496B3" +
-            "8121E007626B78C34D5B13C37D4084DB6E71490E7187CCB1E6CE17BE63F2" +
-            "60644B459CB00D40E50ACAD5C8E8F27A80233AD021F311A434E0FC7D02D8" +
-            "803A23A13DA69CB2C6100EE428CBDA558F7E5C231E8F71D6BF8A77986606" +
-            "5AF256FD8D82B256C92A9C9242B19846967A2EE9092111584A6F630109AA" +
-            "709A6CD69EEC5E7842FB7F45F8BB509B5C81D1BB971E0AB6913125302306" +
+            "2630820122301C060A2A864886F70D010C0103300E0408EE99890BE9F481" +
+            "93020208000482010009B539713D7A4649E43B507649291C4AA972EDA585" +
+            "2469392E5CF6347DB39A338DAE050B8FD23BC06AA1DC75FB0EC88819F692" +
+            "FC8011005A9388A50499EB531296F9CA7C2B7D702B53F98567FA0AF63865" +
+            "3BEE382361321E03EA781CD1A5A9CD7C764B5DD1D6652062DA164CC44351" +
+            "1121E56E2E298173D0B07AE1AF612004F520861CE11A6BC62DF138E650A7" +
+            "D2905422093135864EEC7B6EA69E83DB82EF53D260BCC56D019ADD644DE5" +
+            "0F849113FD7D0FE35A8935338E9DC00E73191C6754E586F0B04D0EF8CA93" +
+            "8131E7579D78F0CE9F564C5C7AD5501800EC66AA676D07F129E30FEA9881" +
+            "99490023F6A5C1907BA60E13AEBF013C8EC75738FE148B3DBF3125302306" +
             "092A864886F70D01091531160414141C1C8591A700DDE70FAC750C1539B2" +
-            "DFECAA3C30413031300D060960864801650304020105000420F3A11CF671" +
-            "71453258BD226BE3E520105D2CC5DB1903BA57AB9D87DFD897FF2D0408E0" +
-            "C39064375BC1B702020800").HexToByteArray();
+            "DFECAA3C30313021300906052B0E03021A05000414C938169F281C6B5254" +
+            "877DA8BED38502E153F40604085BFEE482EAA0A02802020800").HexToByteArray();
 
         internal static readonly byte[] ECDsabrainpoolP160r1_CertificatePemBytes = ByteUtils.AsciiBytes(
             @"-----BEGIN CERTIFICATE-----

src/libraries/System.Security.Cryptography/tests/X509Certificates/PfxTests.cs

@@ -309,6 +309,8 @@ private static void Verify_ECDHPrivateKey_WindowsPfx(ECDiffieHellman ecdh)
         [Theory, MemberData(nameof(BrainpoolCurvesPfx))]
         public static void ReadECDsaPrivateKey_BrainpoolP160r1_Pfx(byte[] pfxData)
         {
+            static bool IsKnownGoodPlatform() => PlatformDetection.IsWindows10OrLater || PlatformDetection.IsUbuntu;
+
             try
             {
                 using (var cert = new X509Certificate2(pfxData, TestData.PfxDataPassword))
@@ -324,11 +326,10 @@ public static void ReadECDsaPrivateKey_BrainpoolP160r1_Pfx(byte[] pfxData)
                     }
                 }
             }
-            catch (CryptographicException)
+            catch (CryptographicException) when (!IsKnownGoodPlatform())
             {
-                // Windows 7, Windows 8, CentOS, macOS can fail. Verify known good platforms don't fail.
-                Assert.False(PlatformDetection.IsWindows && PlatformDetection.WindowsVersion >= 10, "Is Windows 10");
-                Assert.False(PlatformDetection.IsUbuntu, "Is Ubuntu");
+                // Windows 7, Windows 8, CentOS, macOS can fail. If the platform is a known good, let the exception
+                // through since it should not fail.
             }
         }