Imported Upstream version 4.6.0.182

Former-commit-id: 439c182e520038bf50777ca2fe684f216ae28552
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-09-01 10:46:18 +00:00
parent c911219690
commit 804b15604f
118 changed files with 1007 additions and 891 deletions

View File

@@ -159,14 +159,14 @@ namespace System.Security.Cryptography.X509Certificates {
// methods
public override void CopyFrom (AsnEncodedData encodedData)
public override void CopyFrom (AsnEncodedData asnEncodedData)
{
if (encodedData == null)
throw new ArgumentNullException ("encodedData");
if (asnEncodedData == null)
throw new ArgumentNullException ("asnEncodedData");
X509Extension ex = (encodedData as X509Extension);
X509Extension ex = (asnEncodedData as X509Extension);
if (ex == null)
throw new ArgumentException (Locale.GetText ("Wrong type."), "encodedData");
throw new ArgumentException (Locale.GetText ("Wrong type."), "asnEncodedData");
if (ex._oid == null)
_oid = new Oid (oid, friendlyName);