X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Security%2FSystem.Security.Cryptography.Pkcs%2FEnvelopedCms.cs;h=1f57f5c55169931680496f4ed99ac4b1fd1e2aa6;hb=b03e60628764d66654147bfc7a7e1a3242559888;hp=2040b984609b7e35f6046f119617ef0fc1f67991;hpb=a097b5471761180c4aae2dab224ed9caeeae3e86;p=mono.git

diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/EnvelopedCms.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/EnvelopedCms.cs
index 2040b984609..1f57f5c5516 100644
--- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/EnvelopedCms.cs
+++ b/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 SECURITY_DEP
 
 using System.Collections;
 using System.Security.Cryptography.X509Certificates;
@@ -82,14 +82,16 @@ namespace System.Security.Cryptography.Pkcs {
 			: this (contentInfo) 
 		{
 			_idType = recipientIdentifierType;
-			_version = ((_idType == SubjectIdentifierType.SubjectKeyIdentifier) ? 2 : 0);
+			if (_idType == SubjectIdentifierType.SubjectKeyIdentifier)
+				_version = 2;
 		}
 
 		public EnvelopedCms (SubjectIdentifierType recipientIdentifierType, ContentInfo contentInfo, AlgorithmIdentifier encryptionAlgorithm)
 			: this (contentInfo, encryptionAlgorithm) 
 		{
 			_idType = recipientIdentifierType;
-			_version = ((_idType == SubjectIdentifierType.SubjectKeyIdentifier) ? 2 : 0);
+			if (_idType == SubjectIdentifierType.SubjectKeyIdentifier)
+				_version = 2;
 		}
 
 		// properties