mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.20.0.180

Browse Source 
Former-commit-id: ff953ca879339fe1e1211f7220f563e1342e66cb
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-02-04 20:11:37 +00:00
parent 0e2d47d1c8
commit 0510252385
3360 changed files with 83827 additions and 39243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
mcs/class/corlib/System.Security.Cryptography.X509Certificates/X509Certificate.cs
View File

@ -38,7 +38,6 @@ using Internal.Cryptography;
using Microsoft.Win32.SafeHandles;
using Mono.Security;
using Mono.Security.Authenticode;
namespace System.Security.Cryptography.X509Certificates
{
@ -198,8 +197,7 @@ namespace System.Security.Cryptography.X509Certificates
[System.Diagnostics.CodeAnalysis.SuppressMessage ("Microsoft.Usage", "CA2229", Justification = "Public API has already shipped.")]
public X509Certificate (SerializationInfo info, StreamingContext context) : this ()
{
byte[] raw = (byte[]) info.GetValue ("RawData", typeof (byte[]));
Import (raw, (string)null, X509KeyStorageFlags.DefaultKeySet);
throw new PlatformNotSupportedException ();
}
public static X509Certificate CreateFromCertFile (string filename)
@ -214,14 +212,12 @@ namespace System.Security.Cryptography.X509Certificates
void ISerializable.GetObjectData (SerializationInfo info, StreamingContext context)
{
if (!X509Helper.IsValid (impl))
throw new NullReferenceException ();
// will throw a NRE if info is null (just like MS implementation)
info.AddValue ("RawData", impl.RawData);
throw new PlatformNotSupportedException ();
}
void IDeserializationCallback.OnDeserialization (object sender)
{
throw new PlatformNotSupportedException ();
}
public IntPtr Handle {
@ -544,61 +540,40 @@ namespace System.Security.Cryptography.X509Certificates
return sb.ToString ();
}
#endregion
#region Mono Implementation
/*
/* CoreFX throws
/* throw new PlatformNotSupportedException(SR.NotSupported_ImmutableX509Certificate);
/* everywhere.
*/
[ComVisible (false)]
public virtual void Import (byte[] rawData)
{
Import (rawData, (string)null, X509KeyStorageFlags.DefaultKeySet);
throw new PlatformNotSupportedException (SR.NotSupported_ImmutableX509Certificate);
}
[ComVisible (false)]
public virtual void Import (byte[] rawData, string password, X509KeyStorageFlags keyStorageFlags)
{
Reset ();
using (var safePasswordHandle = new SafePasswordHandle (password))
impl = X509Helper.Import (rawData, safePasswordHandle, keyStorageFlags);
throw new PlatformNotSupportedException (SR.NotSupported_ImmutableX509Certificate);
}
public virtual void Import (byte[] rawData, SecureString password, X509KeyStorageFlags keyStorageFlags)
{
using (var safePasswordHandle = new SafePasswordHandle (password))
impl = X509Helper.Import (rawData, safePasswordHandle, keyStorageFlags);
throw new PlatformNotSupportedException (SR.NotSupported_ImmutableX509Certificate);
}
[ComVisible (false)]
public virtual void Import (string fileName)
{
Import (fileName, (string)null, X509KeyStorageFlags.DefaultKeySet);
throw new PlatformNotSupportedException (SR.NotSupported_ImmutableX509Certificate);
}
[ComVisible (false)]
public virtual void Import (string fileName, string password, X509KeyStorageFlags keyStorageFlags)
{
byte[] rawData = File.ReadAllBytes (fileName);
using (var safePasswordHandle = new SafePasswordHandle (password))
impl = X509Helper.Import (rawData, safePasswordHandle, keyStorageFlags);
throw new PlatformNotSupportedException (SR.NotSupported_ImmutableX509Certificate);
}
public virtual void Import (string fileName, SecureString password, X509KeyStorageFlags keyStorageFlags)
{
byte[] rawData = File.ReadAllBytes (fileName);
using (var safePasswordHandle = new SafePasswordHandle (password))
impl = X509Helper.Import (rawData, safePasswordHandle, keyStorageFlags);
throw new PlatformNotSupportedException (SR.NotSupported_ImmutableX509Certificate);
}
#endregion
#region CoreFX Implementation
internal DateTime GetNotAfter ()
{
ThrowIfInvalid ();