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

@ -53,14 +53,14 @@ namespace System.Security.Cryptography.Pkcs {
{
}
public ContentInfo (Oid oid, byte[] content)
public ContentInfo (Oid contentType, byte[] content)
{
if (oid == null)
throw new ArgumentNullException ("oid");
if (contentType == null)
throw new ArgumentNullException ("contentType");
if (content == null)
throw new ArgumentNullException ("content");
_oid = oid;
_oid = contentType;
_content = content;
}