Imported Upstream version 4.0.0~alpha1

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

View File

@@ -12,7 +12,7 @@ LOCAL_MCS_FLAGS = -lib:$(secxml_libdir) -lib:$(bare_libdir)
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:168,169,183,219,414,1595
VALID_PROFILE := $(filter net_1_1 net_2_0 moonlight_raw net_4_0 net_4_5, $(PROFILE))
VALID_PROFILE := $(filter moonlight_raw net_4_5, $(PROFILE))
EXTRA_DISTFILES = \
Test/System.Security.Cryptography.Xml/sample.pfx \
@@ -33,12 +33,3 @@ $(the_libdir_base)/Mono.Security.dll:
(cd ../Mono.Security; $(MAKE))
.NOTPARALLEL: $(secxml_libdir)/System.dll $(bare_libdir)/Mono.Security.dll
# run the PKITS tests only if the data was installed/activated, otherwise ignore them
ifeq (net_2_0, $(PROFILE))
pkits_files := $(wildcard ../System/Test/System.Security.Cryptography.X509Certificates/pkits/hint)
ifndef pkits_files
TEST_HARNESS_EXCLUDES = -exclude:NotWorking,ValueAdd,CAS,InetAccess,PKITS
TEST_HARNESS_EXCLUDES_ONDOTNET = -exclude:NotDotNet,CAS,PKITS
endif
endif

View File

@@ -43,12 +43,6 @@ namespace Mono.Security.Cryptography {
// * AES 128 bits encryption (separate key for each data protected)
// * SHA256 digest to ensure integrity
#if !NET_2_0
internal enum DataProtectionScope {
CurrentUser,
LocalMachine
}
#endif
internal static class ManagedProtection {

View File

@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.IO;
@@ -224,4 +223,3 @@ namespace Mono.Security.Cryptography {
}
}
#endif

View File

@@ -637,7 +637,7 @@ namespace Mono.Xml {
else if (n2 == null)
return 1;
else if (n1.Prefix == n2.Prefix)
return string.Compare (n1.LocalName, n2.LocalName);
return string.CompareOrdinal (n1.LocalName, n2.LocalName);
// Attributes in the default namespace are first
// because the default namespace is not applied to

View File

@@ -27,7 +27,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0 && SECURITY_DEP
#if SECURITY_DEP
namespace System.Security.Cryptography.Pkcs {

View File

@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System.Collections;
using System.Security.Cryptography.X509Certificates;
@@ -73,4 +72,3 @@ namespace System.Security.Cryptography.Pkcs {
}
}
#endif

View File

@@ -27,7 +27,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0 && SECURITY_DEP
#if SECURITY_DEP
using System.Collections;
using System.Security.Cryptography.X509Certificates;

View File

@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.Collections;
@@ -69,4 +68,3 @@ namespace System.Security.Cryptography.Pkcs {
}
}
#endif

View File

@@ -27,7 +27,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0 && SECURITY_DEP
#if SECURITY_DEP
using System.Security.Cryptography.X509Certificates;

View File

@@ -27,7 +27,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0 && SECURITY_DEP
#if SECURITY_DEP
using Mono.Security;

View File

@@ -27,7 +27,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0 && SECURITY_DEP
#if SECURITY_DEP
using System.Collections;
using System.Security.Cryptography.X509Certificates;

View File

@@ -28,7 +28,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
@@ -41,4 +40,3 @@ namespace System.Security.Cryptography.Pkcs {
}
}
#endif

View File

@@ -27,7 +27,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0 && SECURITY_DEP
#if SECURITY_DEP
namespace System.Security.Cryptography.Pkcs {

View File

@@ -27,7 +27,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0 && SECURITY_DEP
#if SECURITY_DEP
using System.Collections;

View File

@@ -27,7 +27,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0 && SECURITY_DEP
#if SECURITY_DEP
using System.Collections;

View File

@@ -28,7 +28,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0 && SECURITY_DEP
#if SECURITY_DEP
using Mono.Security;

View File

@@ -27,7 +27,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0 && SECURITY_DEP
#if SECURITY_DEP
using System.Text;

View File

@@ -27,7 +27,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0 && SECURITY_DEP
#if SECURITY_DEP
using System.Text;

View File

@@ -28,7 +28,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0 && SECURITY_DEP
#if SECURITY_DEP
using Mono.Security;

View File

@@ -27,7 +27,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0 && SECURITY_DEP
#if SECURITY_DEP
using System.Globalization;
using System.Text;

Some files were not shown because too many files have changed in this diff Show More