Modify algorithm not supported tests to expect CryptographicException

Author: bartonjs

src/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/ContentEncryptionAlgorithmTests.cs

@@ -146,7 +146,11 @@ public static void DecodeAlgorithmRc4_40_PlatformNotSupported()
             using (X509Certificate2 cert = Certificates.RSAKeyTransferCapi1.GetCertificate())
             {
                 CmsRecipient recipient = new CmsRecipient(SubjectIdentifierType.IssuerAndSerialNumber, cert);
-                Assert.Throws<PlatformNotSupportedException>(() => ecms.Encrypt(recipient));
+
+                CryptographicException e =
+                    Assert.Throws<CryptographicException>(() => ecms.Encrypt(recipient));
+
+                Assert.Contains(Oids.Rc4, e.Message);
             }
         }
 

src/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/KeyAgreeRecipientInfoTests.cs

@@ -24,7 +24,11 @@ public static void TestKeyAgreement_PlatformNotSupported()
             using (X509Certificate2 cert = Certificates.DHKeyAgree1.GetCertificate())
             {
                 CmsRecipient cmsRecipient = new CmsRecipient(cert);
-                Assert.Throws<PlatformNotSupportedException>(() => ecms.Encrypt(cmsRecipient));
+
+                CryptographicException e =
+                    Assert.Throws<CryptographicException>(() => ecms.Encrypt(cmsRecipient));
+
+                Assert.Contains(cert.GetKeyAlgorithm(), e.Message);
             }
         }