Merge pull request #649 from DavidS/feature/implement-additional-reference-path

[mono.git] / mcs / class / System / System.Security.Cryptography / AsnEncodedData.cs

diff --git a/mcs/class/System/System.Security.Cryptography/AsnEncodedData.cs b/mcs/class/System/System.Security.Cryptography/AsnEncodedData.cs
index 548017aa6a0b2f2a28c032a42889ffa7c5d1bad2..995f1b220c2d68b4ce5b1d04a970fe9be9c3e21f 100644 (file)
--- a/mcs/class/System/System.Security.Cryptography/AsnEncodedData.cs
+++ b/mcs/class/System/System.Security.Cryptography/AsnEncodedData.cs
@@ -27,13 +27,19 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0 && SECURITY_DEP
-
-using System.Security.Cryptography.X509Certificates;
-using System.Text;
+#if SECURITY_DEP
 
+#if MONOTOUCH
 using Mono.Security;
 using Mono.Security.Cryptography;
+#else
+extern alias MonoSecurity;
+using MonoSecurity::Mono.Security;
+using MonoSecurity::Mono.Security.Cryptography;
+#endif
+
+using System.Security.Cryptography.X509Certificates;
+using System.Text;
 
 namespace System.Security.Cryptography {
 
@@ -78,7 +84,8 @@ namespace System.Security.Cryptography {
                        if (asnEncodedData == null)
                                throw new ArgumentNullException ("asnEncodedData");
 
-                       Oid = new Oid (asnEncodedData._oid);
+                       if (asnEncodedData._oid != null)
+                               Oid = new Oid (asnEncodedData._oid);
                        RawData = asnEncodedData._raw;
                }