Make Unix X500DistinguishedName tests pass if issue 1985 ("S=" vs "ST=") was the only issue.

By transforming the Windows/ITU "S=" into the OpenSSL "ST=" the rest of the test around X500DistinguishedName should proceed.

Author: bartonjs

src/System.Security.Cryptography.X509Certificates/tests/PropsTests.cs

@@ -13,7 +13,7 @@ public static void TestIssuer()
             using (var c = new X509Certificate2(TestData.MsCertificate))
             {
                 Assert.Equal(
-                    "CN=Microsoft Code Signing PCA, O=Microsoft Corporation, L=Redmond, S=Washington, C=US",
+                    TestData.NormalizeX500String("CN=Microsoft Code Signing PCA, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"),
                     c.Issuer);
             }
         }
@@ -24,7 +24,7 @@ public static void TestSubject()
             using (var c = new X509Certificate2(TestData.MsCertificate))
             {
                 Assert.Equal(
-                    "CN=Microsoft Corporation, OU=MOPR, O=Microsoft Corporation, L=Redmond, S=Washington, C=US",
+                    TestData.NormalizeX500String("CN=Microsoft Corporation, OU=MOPR, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"),
                     c.Subject);
             }
         }
@@ -216,7 +216,7 @@ public static void TestSubjectName()
             using (var c = new X509Certificate2(TestData.MsCertificate))
             {
                 Assert.Equal(
-                    "CN=Microsoft Corporation, OU=MOPR, O=Microsoft Corporation, L=Redmond, S=Washington, C=US",
+                    TestData.NormalizeX500String("CN=Microsoft Corporation, OU=MOPR, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"),
                     c.SubjectName.Name);
             }
         }
@@ -227,7 +227,7 @@ public static void TestIssuerName()
             using (var c = new X509Certificate2(TestData.MsCertificate))
             {
                 Assert.Equal(
-                    "CN=Microsoft Code Signing PCA, O=Microsoft Corporation, L=Redmond, S=Washington, C=US",
+                    TestData.NormalizeX500String("CN=Microsoft Code Signing PCA, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"),
                     c.IssuerName.Name);
 
             }

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

@@ -370,5 +370,20 @@ internal static class TestData
             "29008DE8B851E2C30B6BF73F219BCE651E5972E62D651BA171D1DA9831A449D99" +
             "AF4E2F4B9EE3FD0991EF305ADDA633C44EB5E4979751280B3F54F9CCD561AC27D" +
             "3426BC6FF32E8E1AAF9F7C0150A726B").HexToByteArray();
+
+        internal static string NormalizeX500String(string expected)
+        {
+            if (StringComparer.Ordinal.Equals("Windows_NT", Environment.GetEnvironmentVariable("OS")))
+            {
+                return expected;
+            }
+
+            // Windows calls OID(2.5.4.8) "S", which matches ITU X.520.
+            // OpenSSL calls it "ST", because RFC1327 calls "S" surname.
+            // 
+            // This provides a test mitigation for issue 1985, allowing the
+            // thrust of the test to proceed with this one known problem.
+            return expected.Replace(" S=", " ST=");
+        }
     }
 }