Imported Upstream version 5.18.0.142

Former-commit-id: 7467d4b717762eeaf652d77f1486dd11ffb1ff1f

mcs/class/corlib/Test/System.Security.Cryptography.X509Certificates/X509CapiTest.cs

@@ -29,6 +29,9 @@ namespace MonoTests.System.Security.Cryptography.X509Certificates {
 	// is similar to the one provided by CAPI.
 
 	[TestFixture]
+	// We are throwing `PlatformNotSupportedException`.
+	// See https://github.com/mono/mono/pull/9472#issuecomment-404006558 for details.
+	[Category ("NotWorking")]
 	public class X509CAPI {
 
 		// copied from X509Certificate for test uses only

mcs/class/corlib/Test/System.Security.Cryptography.X509Certificates/X509CertificateCas.cs

@@ -42,6 +42,7 @@ namespace MonoCasTests.System.Security.Cryptography.X509Certificates {
 
 	[TestFixture]
 	[Category ("CAS")]
+	[Category ("X509Certificates")]
 	public class X509CertificateCas {
 
 		private static readonly byte[] cert = { 0x30,0x82,0x01,0xFF,0x30,0x82,0x01,0x6C,0x02,0x05,0x02,0x72,0x00,0x06,0xE8,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x02,0x05,0x00,0x30,0x5F,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x55,0x53,0x31,0x20,0x30,0x1E,0x06,0x03,0x55,0x04,0x0A,0x13,0x17,0x52,0x53,0x41,0x20,0x44,0x61,0x74,0x61,0x20,0x53,0x65,0x63,0x75,0x72,0x69,0x74,0x79,0x2C,0x20,0x49,0x6E,0x63,0x2E,0x31,0x2E,0x30,0x2C,0x06,0x03,0x55,0x04,0x0B,0x13,0x25,0x53,0x65,0x63,0x75,0x72,0x65,0x20,0x53,0x65,0x72,0x76,

mcs/class/corlib/Test/System.Security.Cryptography.X509Certificates/X509CertificateTest.cs.REMOVED.git-id

@@ -1 +1 @@
-634dda0599c90556f1d6a23661203f22d01cbfa3
+aa0f9e9a5afdd4397e18bae68a24eb10da0d5cd0

mcs/class/corlib/Test/System.Security.Cryptography.X509Certificates/X509SpcTest.cs

@@ -1016,6 +1016,7 @@ namespace MonoTests.System.Security.Cryptography.X509Certificates {
 		}
 
 		[Test]
+		[Category ("NotWorking")] // we are now throwing due to the invalid signature
 		public void InvalidSignature () 
 		{
 			string filename = Path.Combine (Path.GetTempPath (), "smallspc-invalid.exe");