Imported Upstream version 4.6.0.150

Former-commit-id: 73e3bb1e96dd09dc931c1dfe559d2c7f7b8b02c7

mcs/class/System/System.Security.Cryptography.X509Certificates/X509Certificate2ImplMono.cs

@@ -57,6 +57,7 @@ namespace System.Security.Cryptography.X509Certificates
 		X500DistinguishedName issuer_name;
 		X500DistinguishedName subject_name;
 		Oid signature_algorithm;
+		X509CertificateImplCollection intermediateCerts;
 
 		MX.X509Certificate _cert;
 
@@ -77,18 +78,25 @@ namespace System.Security.Cryptography.X509Certificates
 			return IntPtr.Zero;
 		}
 
-		internal X509Certificate2ImplMono (MX.X509Certificate cert)
+		X509Certificate2ImplMono (MX.X509Certificate cert)
 		{
 			this._cert = cert;
 		}
 
+		X509Certificate2ImplMono (X509Certificate2ImplMono other)
+		{
+			_cert = other._cert;
+			if (other.intermediateCerts != null)
+				intermediateCerts = other.intermediateCerts.Clone ();
+		}
+
 		public override X509CertificateImpl Clone ()
 		{
 			ThrowIfContextInvalid ();
-			return new X509Certificate2ImplMono (_cert);
+			return new X509Certificate2ImplMono (this);
 		}
 
-		#region Implemented X509CertificateImpl members
+#region Implemented X509CertificateImpl members
 
 		public override string GetIssuerName (bool legacyV1Mode)
 		{
@@ -183,7 +191,7 @@ namespace System.Security.Cryptography.X509Certificates
 			}
 		}
 
-		#endregion
+#endregion
 
 		// constructors
 
@@ -459,6 +467,15 @@ namespace System.Security.Cryptography.X509Certificates
 					cert.RSA = (keypair as RSA);
 					cert.DSA = (keypair as DSA);
 				}
+				if (pfx.Certificates.Count > 1) {
+					intermediateCerts = new X509CertificateImplCollection ();
+					foreach (var c in pfx.Certificates) {
+						if (c == cert)
+							continue;
+						var impl = new X509Certificate2ImplMono (c);
+						intermediateCerts.Add (impl, true);
+					}
+				}
 				return cert;
 			}
 		}
@@ -546,6 +563,10 @@ namespace System.Security.Cryptography.X509Certificates
 			issuer_name = null;
 			subject_name = null;
 			signature_algorithm = null;
+			if (intermediateCerts != null) {
+				intermediateCerts.Dispose ();
+				intermediateCerts = null;
+			}
 		}
 
 		public override string ToString ()
@@ -687,6 +708,10 @@ namespace System.Security.Cryptography.X509Certificates
 			return GetCertContentType (data);
 		}
 
+		internal override X509CertificateImplCollection IntermediateCertificates {
+			get { return intermediateCerts; }
+		}
+
 		// internal stuff because X509Certificate2 isn't complete enough
 		// (maybe X509Certificate3 will be better?)