Imported Upstream version 4.2.0.179

Former-commit-id: 4610231f55806d2a05ed69e5ff3faa7336cc1479
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent aa7da660d6
commit c042cd0c52
7507 changed files with 90259 additions and 657307 deletions

View File

@ -41,6 +41,7 @@ using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Security.Permissions;
using System.Text;
using System.Security.Cryptography.X509Certificates;
using Mono.Xml;
@ -511,6 +512,11 @@ public partial class CryptoConfig {
}
}
internal static string MapNameToOID (string name, OidGroup oidGroup)
{
return MapNameToOID (name);
}
public static string MapNameToOID (string name)
{
if (name == null)
@ -527,11 +533,6 @@ public partial class CryptoConfig {
return result;
}
[MonoLimitation ("nothing is FIPS certified so it never make sense to restrict to this (empty) subset")]
public static bool AllowOnlyFipsAlgorithms {
get { return false; }
}
public static void AddAlgorithm (Type algorithm, params string[] names)
{
if (algorithm == null)