Update Crypto.Xml to match ref

Reference assembly for S.S.C.Xml didn't match and had a duplicated
version of an API in the implementation which we needed to eliminate.

Author: weshaggard

src/System.Security.Cryptography.Pkcs/src/MatchingRefApiCompatBaseline.netstandard.txt

@@ -1,4 +1,5 @@
 Compat issues with assembly System.Security.Cryptography.Pkcs:
+#These members don't belong in netstandard reference because of type unification with netfx (the members are new in net472).
 MembersMustExist : Member 'System.Security.Cryptography.Pkcs.SignerInfo.GetSignature()' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'System.Security.Cryptography.Pkcs.SignerInfo.SignatureAlgorithm.get()' does not exist in the implementation but it does exist in the contract.
 Total Issues: 2

src/System.Security.Cryptography.Xml/src/MatchingRefApiCompatBaseline.netstandard.txt

@@ -1,4 +1,3 @@
 Compat issues with assembly System.Security.Cryptography.Xml:
+#Type must be public in implementation for serialization to work but we don't want to expose it publicly in the contract as it isn't public on .NET Framework
 TypesMustExist : Type 'System.Security.Cryptography.Xml.CryptoSignedXmlRecursionException' does not exist in the implementation but it does exist in the contract.
-TypesMustExist : Type 'System.Security.Cryptography.Xml.X509IssuerSerial' does not exist in the implementation but it does exist in the contract.
-Total Issues: 2

src/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj

@@ -73,7 +73,6 @@
     <Compile Include="System\Security\Cryptography\Xml\TransformChain.cs" />
     <Compile Include="System\Security\Cryptography\Xml\TransformInputType.cs" />
     <Compile Include="System\Security\Cryptography\Xml\Utils.cs" />
-    <Compile Include="System\Security\Cryptography\Xml\X509IssuerSerial.cs" />
     <Compile Include="System\Security\Cryptography\Xml\XmlDecryptionTransform.cs" />
     <Compile Include="System\Security\Cryptography\Xml\XmlDsigBase64Transform.cs" />
     <Compile Include="System\Security\Cryptography\Xml\XmlDsigC14NTransform.cs" />
@@ -106,6 +105,7 @@
     <Reference Include="System.Security.Cryptography.Csp" />
     <Reference Include="System.Security.Cryptography.Encoding" />
     <Reference Include="System.Security.Cryptography.Primitives" />
+    <Reference Include="System.Security.Cryptography.Pkcs" />
     <Reference Include="System.Security.Cryptography.X509Certificates" />
     <Reference Include="System.Security.Permissions" />
     <Reference Include="System.Text.Encoding.Extensions" />

src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/KeyInfoX509Data.cs

@@ -16,7 +16,7 @@ namespace System.Security.Cryptography.Xml
 {
     public class KeyInfoX509Data : KeyInfoClause
     {
-        // An array of certificates representing the certificate chain 
+        // An array of certificates representing the certificate chain
         private ArrayList _certificates = null;
         // An array of issuer serial structs
         private ArrayList _issuerSerials = null;
@@ -167,15 +167,15 @@ public void AddIssuerSerial(string issuerName, string serialNumber)
 
             if (_issuerSerials == null)
                 _issuerSerials = new ArrayList();
-            _issuerSerials.Add(new X509IssuerSerial(issuerName, h.ToString()));
+            _issuerSerials.Add(Utils.CreateX509IssuerSerial(issuerName, h.ToString()));
         }
 
         // When we load an X509Data from Xml, we know the serial number is in decimal representation.
         internal void InternalAddIssuerSerial(string issuerName, string serialNumber)
         {
             if (_issuerSerials == null)
                 _issuerSerials = new ArrayList();
-            _issuerSerials.Add(new X509IssuerSerial(issuerName, serialNumber));
+            _issuerSerials.Add(Utils.CreateX509IssuerSerial(issuerName, serialNumber));
         }
 
         public byte[] CRL

src/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/Utils.cs

@@ -309,7 +309,7 @@ internal static string GetIdFromLocalUri(string uri, out bool discardComments)
             // initialize the return value
             discardComments = true;
 
-            // Deal with XPointer of type #xpointer(id("ID")). Other XPointer support isn't handled here and is anyway optional 
+            // Deal with XPointer of type #xpointer(id("ID")). Other XPointer support isn't handled here and is anyway optional
             if (idref.StartsWith("xpointer(id(", StringComparison.Ordinal))
             {
                 int startId = idref.IndexOf("id(", StringComparison.Ordinal);
@@ -328,7 +328,7 @@ internal static string ExtractIdFromLocalUri(string uri)
         {
             string idref = uri.Substring(1);
 
-            // Deal with XPointer of type #xpointer(id("ID")). Other XPointer support isn't handled here and is anyway optional 
+            // Deal with XPointer of type #xpointer(id("ID")). Other XPointer support isn't handled here and is anyway optional
             if (idref.StartsWith("xpointer(id(", StringComparison.Ordinal))
             {
                 int startId = idref.IndexOf("id(", StringComparison.Ordinal);
@@ -356,9 +356,9 @@ internal static void RemoveAllChildren(XmlElement inputElement)
             }
         }
 
-        // Writes one stream (starting from the current position) into 
-        // an output stream, connecting them up and reading until 
-        // hitting the end of the input stream.  
+        // Writes one stream (starting from the current position) into
+        // an output stream, connecting them up and reading until
+        // hitting the end of the input stream.
         // returns the number of bytes copied
         internal static long Pump(Stream input, Stream output)
         {
@@ -482,7 +482,7 @@ internal static void AddNamespaces(XmlElement elem, Hashtable namespaces)
             }
         }
 
-        // This method gets the attributes that should be propagated 
+        // This method gets the attributes that should be propagated
         internal static CanonicalXmlNodeList GetPropagatedAttributes(XmlElement elem)
         {
             if (elem == null)
@@ -606,6 +606,21 @@ internal static int GetHexArraySize(byte[] hex)
             return index + 1;
         }
 
+        // Mimic the behavior of the X509IssuerSerial constructor with null and empty checks
+        internal static X509IssuerSerial CreateX509IssuerSerial(string issuerName, string serialNumber)
+        {
+            if (issuerName == null || issuerName.Length == 0)
+                throw new ArgumentException(SR.Arg_EmptyOrNullString, nameof(issuerName));
+            if (serialNumber == null || serialNumber.Length == 0)
+                throw new ArgumentException(SR.Arg_EmptyOrNullString, nameof(serialNumber));
+
+            return new X509IssuerSerial()
+            {
+                IssuerName = issuerName,
+                SerialNumber = serialNumber
+            };
+        }
+
         internal static X509Certificate2Collection BuildBagOfCerts(KeyInfoX509Data keyInfoX509Data, CertUsageType certUsageType)
         {
             X509Certificate2Collection collection = new X509Certificate2Collection();
@@ -620,7 +635,7 @@ internal static X509Certificate2Collection BuildBagOfCerts(KeyInfoX509Data keyIn
                             collection.Add(certificate);
                             break;
                         case CertUsageType.Decryption:
-                            decryptionIssuerSerials.Add(new X509IssuerSerial(certificate.IssuerName.Name, certificate.SerialNumber));
+                            decryptionIssuerSerials.Add(CreateX509IssuerSerial(certificate.IssuerName.Name, certificate.SerialNumber));
                             break;
                     }
                 }