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

Imported Upstream version 4.0.0~alpha1

Browse Source 
Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mcs/class/corlib/System.Security.Cryptography/CryptoConfig.cs
View File

@ -222,7 +222,6 @@ public partial class CryptoConfig {
// new (2.0) X509 Chain
private const string nameX509Chain = "X509Chain";
private const string defaultX509Chain = defaultNamespace + "X509Certificates.X509Chain, " + Consts.AssemblySystem;
#if NET_4_0
// AES
const string system_core_assembly = ", System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
const string nameAES_1 = "AES";
@ -273,7 +272,6 @@ public partial class CryptoConfig {
// SHA512 provider
const string nameSHA512Provider = "System.Security.Cryptography.SHA512CryptoServiceProvider";
const string defaultSHA512Provider = "System.Security.Cryptography.SHA512CryptoServiceProvider" + system_core_assembly;
#endif
static CryptoConfig ()
{
// lock(this) is bad
@ -393,7 +391,6 @@ public partial class CryptoConfig {
unresolved_algorithms.Add (oidX509EnhancedKeyUsage, nameX509EnhancedKeyUsage);
// note: the default X.509Chain can also be created this way
unresolved_algorithms.Add (nameX509Chain, defaultX509Chain);
#if NET_4_0
unresolved_algorithms.Add (nameAES_1, defaultAES_1);
unresolved_algorithms.Add (nameAES_2, defaultAES_1);
unresolved_algorithms.Add (nameAESManaged_1, defaultAESManaged);
@ -415,7 +412,6 @@ public partial class CryptoConfig {
unresolved_algorithms.Add (nameSHA384Provider, defaultSHA384Provider);
unresolved_algorithms.Add (nameSHA512Cng, defaultSHA512Cng);
unresolved_algorithms.Add (nameSHA512Provider, defaultSHA512Provider);
#endif
Dictionary<string,string> oid = new Dictionary<string, string> (StringComparer.OrdinalIgnoreCase);
// comments here are to match with MS implementation (but not with doc)
@ -531,7 +527,6 @@ public partial class CryptoConfig {
return result;
}
#if NET_4_0
[MonoLimitation ("nothing is FIPS certified so it never make sense to restrict to this (empty) subset")]
public static bool AllowOnlyFipsAlgorithms {
get { return false; }
@ -564,7 +559,6 @@ public partial class CryptoConfig {
oids [oid] = name;
}
}
#endif
class CryptoHandler: SmallXmlParser.IContentHandler {