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

@ -61,12 +61,12 @@ namespace System.Security.Cryptography.Pkcs {
_uattribs = new CryptographicAttributeObjectCollection ();
}
public EnvelopedCms (ContentInfo content) : this ()
public EnvelopedCms (ContentInfo contentInfo) : this ()
{
if (content == null)
throw new ArgumentNullException ("content");
if (contentInfo == null)
throw new ArgumentNullException ("contentInfo");
_content = content;
_content = contentInfo;
}
public EnvelopedCms (ContentInfo contentInfo, AlgorithmIdentifier encryptionAlgorithm)