Imported Upstream version 4.4.0.142

Former-commit-id: 08ca4d6ded648b2ac2eb817c12d5723b52edbb16
This commit is contained in:
Xamarin Public Jenkins
2016-04-28 08:44:23 -04:00
parent d444f0caa4
commit 67cc8417df
39 changed files with 187 additions and 47 deletions

View File

@@ -37,6 +37,11 @@ namespace System.Security.Cryptography.X509Certificates
get;
}
/*
* This is used in System.dll's OSX509Certificates.cs
*/
public abstract IntPtr GetNativeAppleCertificate ();
protected void ThrowIfContextInvalid ()
{
if (!IsValid)

View File

@@ -34,7 +34,7 @@ using MX = Mono.Security.X509;
namespace System.Security.Cryptography.X509Certificates
{
class X509CertificateImplMono : X509CertificateImpl
sealed class X509CertificateImplMono : X509CertificateImpl
{
MX.X509Certificate x509;
@@ -51,6 +51,11 @@ namespace System.Security.Cryptography.X509Certificates
get { return IntPtr.Zero; }
}
public override IntPtr GetNativeAppleCertificate ()
{
return IntPtr.Zero;
}
public override X509CertificateImpl Clone ()
{
ThrowIfContextInvalid ();

View File

@@ -39,7 +39,7 @@ namespace MonoTests.System.Security.Cryptography {
public void Ctor ()
{
var cp = new CspParameters ();
Assert.AreEqual (24, cp.ProviderType);
Assert.AreEqual (1, cp.ProviderType);
}
}
}