Merge pull request #3028 from lateralusX/jlorenss/threadpool_warning

[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 b4c17f84103574250eed74cd5011dc0aa9d62bd7..f6b45dd5e7ccd06af2833941fe3a4ce78bbe3771 100644 (file)
--- a/mcs/class/System/System.Security.Cryptography/AsnEncodedData.cs
+++ b/mcs/class/System/System.Security.Cryptography/AsnEncodedData.cs
@@ -29,11 +29,17 @@
 
 #if SECURITY_DEP
 
-using System.Security.Cryptography.X509Certificates;
-using System.Text;
-
+#if MONO_SECURITY_ALIAS
+extern alias MonoSecurity;
+using MonoSecurity::Mono.Security;
+using MonoSecurity::Mono.Security.Cryptography;
+#else
 using Mono.Security;
 using Mono.Security.Cryptography;
+#endif
+
+using System.Security.Cryptography.X509Certificates;
+using System.Text;
 
 namespace System.Security.Cryptography {
 
@@ -151,9 +157,9 @@ namespace System.Security.Cryptography {
                                return SubjectKeyIdentifierExtension (multiLine);
                        // other known objects (i.e. supported structure) - 
                        // but without any corresponding framework class
-                       case Oid.oidSubjectAltName:
+                       case "2.5.29.17": // oidSubjectAltName:
                                return SubjectAltName (multiLine);
-                       case Oid.oidNetscapeCertType:
+                       case "2.16.840.1.113730.1.1": // oidNetscapeCertType
                                return NetscapeCertType (multiLine);
                        default:
                                return Default (multiLine);