diff options
| author | Marek Safar <marek.safar@gmail.com> | 2009-06-05 20:27:11 +0400 |
|---|---|---|
| committer | Marek Safar <marek.safar@gmail.com> | 2009-06-05 20:27:11 +0400 |
| commit | 2d36f507092d8d02b642dacf11def87f27143034 (patch) | |
| tree | 846d27023a936e5ca9b5c923a60848db2c826690 /mcs/class/System.Security/System.Security.Cryptography.Xml | |
| parent | 2230659a57a2725a61f3c7ef150d9cf54b28adcf (diff) | |
2009-06-05 Marek Safar <marek.safar@gmail.com>
* Makefile: Fixed NET_2_0 conditional to actually handle Mono.Security
dependency.
svn path=/trunk/mcs/; revision=135540
Diffstat (limited to 'mcs/class/System.Security/System.Security.Cryptography.Xml')
3 files changed, 8 insertions, 3 deletions
diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/ChangeLog b/mcs/class/System.Security/System.Security.Cryptography.Xml/ChangeLog index c4869176530..dc649237140 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Xml/ChangeLog +++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/ChangeLog @@ -1,3 +1,8 @@ +2009-06-05 Marek Safar <marek.safar@gmail.com> + + * *.cs: Fixed NET_2_0 conditional to actually handle Mono.Security + dependency. + 2008-11-01 Sebastien Pouliot <sebastien@ximian.com> * EncryptedXml.cs: Add proper null check inside methods. diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/KeyInfoX509Data.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/KeyInfoX509Data.cs index 562f930e816..4cd667491ea 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Xml/KeyInfoX509Data.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/KeyInfoX509Data.cs @@ -59,7 +59,7 @@ namespace System.Security.Cryptography.Xml { AddCertificate (cert); } -#if NET_2_0 +#if NET_2_0 && SECURITY_DEP public KeyInfoX509Data (X509Certificate cert, X509IncludeOption includeOption) { if (cert == null) diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/SignedXml.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/SignedXml.cs index 68adec70c92..ef2532f01d8 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Xml/SignedXml.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/SignedXml.cs @@ -721,7 +721,7 @@ namespace System.Security.Cryptography.Xml { pkEnumerator = m_signature.KeyInfo.GetEnumerator (); } -#if NET_2_0 +#if NET_2_0 && SECURITY_DEP if (_x509Enumerator != null) { if (_x509Enumerator.MoveNext ()) { X509Certificate cert = (X509Certificate) _x509Enumerator.Current; @@ -745,7 +745,7 @@ namespace System.Security.Cryptography.Xml { return key; } -#if NET_2_0 +#if NET_2_0 && SECURITY_DEP if (kic is KeyInfoX509Data) { _x509Enumerator = ((KeyInfoX509Data) kic).Certificates.GetEnumerator (); if (_x509Enumerator.MoveNext ()) { |