Imported Upstream version 4.8.0.309

Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions

View File

@@ -45,6 +45,7 @@ using MX = Mono.Security.X509;
using System.IO;
using System.Text;
using System.Collections;
using System.Runtime.Serialization;
namespace System.Security.Cryptography.X509Certificates {
@@ -134,6 +135,10 @@ namespace System.Security.Cryptography.X509Certificates {
{
}
protected X509Certificate2 (SerializationInfo info, StreamingContext context) : base (info, context)
{
}
internal X509Certificate2 (X509Certificate2Impl impl)
: base (impl)
{
@@ -394,13 +399,10 @@ namespace System.Security.Cryptography.X509Certificates {
// internal stuff because X509Certificate2 isn't complete enough
// (maybe X509Certificate3 will be better?)
[Obsolete ("KILL")]
[MonoTODO ("See comment in X509Helper2.GetMonoCertificate().")]
internal MX.X509Certificate MonoCertificate {
get {
var monoImpl = Impl as X509Certificate2ImplMono;
if (monoImpl == null)
throw new NotSupportedException ();
return monoImpl.MonoCertificate;
return X509Helper2.GetMonoCertificate (this);
}
}