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

Imported Upstream version 4.6.0.182

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

8
mcs/class/System.Security/System.Security.Cryptography.Pkcs/AlgorithmIdentifier.cs
View File

@@ -45,15 +45,15 @@ namespace System.Security.Cryptography.Pkcs {
_params = new byte [0];
}
public AlgorithmIdentifier (Oid algorithm)
public AlgorithmIdentifier (Oid oid)
{
_oid = algorithm;
_oid = oid;
_params = new byte [0];
}
public AlgorithmIdentifier (Oid algorithm, int keyLength)
public AlgorithmIdentifier (Oid oid, int keyLength)
{
_oid = algorithm;
_oid = oid;
_length = keyLength;
_params = new byte [0];
}

8
mcs/class/System.Security/System.Security.Cryptography.Pkcs/ContentInfo.cs
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;
}

8
mcs/class/System.Security/System.Security.Cryptography.Pkcs/EnvelopedCms.cs
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)