2009-06-05 Marek Safar <[email protected]>

	* Makefile: Fixed NET_2_0 conditional to actually handle Mono.Security
	dependency.


svn path=/trunk/mcs/; revision=135540

mcs/class/System.Security/ChangeLog

@@ -1,3 +1,8 @@
+2009-06-05  Marek Safar  <[email protected]>
+
+	* Makefile: Fixed NET_2_0 conditional to actually handle Mono.Security
+	dependency.
+
 2008-11-01  Sebastien Pouliot  <[email protected]>
 
 	* System.Security_test.dll.sources: Add new tests to build

mcs/class/System.Security/Makefile

@@ -13,6 +13,13 @@ LIB_MCS_FLAGS += -r:Mono.Security.dll -nowarn:414
 TEST_MCS_FLAGS += -nowarn:168,183,414
 endif
 
+VALID_PROFILE := $(filter net_1_1 net_2_0 net_2_1_raw net_4_0, $(PROFILE))
+ifndef VALID_PROFILE
+# @echo "** Warning: System.Security.dll built without parts that depend on: Mono.Security.dll "
+else
+ LIB_MCS_FLAGS += -d:SECURITY_DEP
+endif
+
 EXTRA_DISTFILES = \
 	Test/System.Security.Cryptography.Xml/sample.pfx \
 	Test/System.Security.Cryptography.Xml/EncryptedXmlSample1.xml \

mcs/class/System.Security/System.Security.Cryptography.Pkcs/AlgorithmIdentifier.cs

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

mcs/class/System.Security/System.Security.Cryptography.Pkcs/ChangeLog

@@ -1,3 +1,8 @@
+2009-06-05  Marek Safar  <[email protected]>
+
+	* *.cs: Fixed NET_2_0 conditional to actually handle Mono.Security
+	dependency.
+
 2008-11-01  Sebastien Pouliot  <[email protected]>
 
 	* CmsRecipientCollection.cs: Add comment about compatibility-NRE

mcs/class/System.Security/System.Security.Cryptography.Pkcs/CmsRecipientCollection.cs

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

mcs/class/System.Security/System.Security.Cryptography.Pkcs/CmsSigner.cs

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

mcs/class/System.Security/System.Security.Cryptography.Pkcs/ContentInfo.cs

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

mcs/class/System.Security/System.Security.Cryptography.Pkcs/EnvelopedCms.cs

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

mcs/class/System.Security/System.Security.Cryptography.Pkcs/KeyAgreeRecipientInfo.cs

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

mcs/class/System.Security/System.Security.Cryptography.Pkcs/KeyTransRecipientInfo.cs

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

mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9Attribute.cs

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

mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9ContentType.cs

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

mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9DocumentDescription.cs

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

mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9DocumentName.cs

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

mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9MessageDigest.cs

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

mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9SigningTime.cs

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

mcs/class/System.Security/System.Security.Cryptography.Pkcs/PublicKeyInfo.cs

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

mcs/class/System.Security/System.Security.Cryptography.Pkcs/RecipientInfo.cs

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

mcs/class/System.Security/System.Security.Cryptography.Pkcs/RecipientInfoCollection.cs

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

mcs/class/System.Security/System.Security.Cryptography.Pkcs/RecipientInfoEnumerator.cs

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

mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignedCms.cs

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

mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignerInfo.cs

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

mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignerInfoCollection.cs

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

mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignerInfoEnumerator.cs

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

mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509Certificate2UI.cs

@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
+#if NET_2_0 && SECURITY_DEP
 
 // Notes:
 //

mcs/class/System.Security/System.Security.Cryptography.Xml/ChangeLog

@@ -1,3 +1,8 @@
+2009-06-05  Marek Safar  <[email protected]>
+
+	* *.cs: Fixed NET_2_0 conditional to actually handle Mono.Security
+	dependency.
+
 2008-11-01  Sebastien Pouliot  <[email protected]>
 
 	* EncryptedXml.cs: Add proper null check inside methods.

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)

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 ()) {

mcs/class/System.Security/System.Security.Cryptography/ChangeLog

@@ -1,3 +1,8 @@
+2009-06-05  Marek Safar  <[email protected]>
+
+	* *.cs: Fixed NET_2_0 conditional to actually handle Mono.Security
+	dependency.
+
 2005-10-27  Sebastien Pouliot  <[email protected]>
 
 	* ProtectedData.cs: Added support for Windows (2000 and later) by 

mcs/class/System.Security/System.Security.Cryptography/CryptographicAttribute.cs

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

mcs/class/System.Security/System.Security.Cryptography/CryptographicAttributeCollection.cs

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

mcs/class/System.Security/System.Security.Cryptography/CryptographicAttributeEnumerator.cs

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