Merge pull request #3528 from BrzVlad/fix-sgen-check-before-collections

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

diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509KeyUsageExtension.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509KeyUsageExtension.cs
index ac7e05387511b019f3425b21f2aef3cd2d1f0813..192c9bd4d7516a27092e22ed6959429e07f826aa 100644 (file)
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509KeyUsageExtension.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509KeyUsageExtension.cs
@@ -30,12 +30,15 @@
 
 #if SECURITY_DEP
 
+#if MONO_SECURITY_ALIAS
 extern alias MonoSecurity;
+using MonoSecurity::Mono.Security;
+#else
+using Mono.Security;
+#endif
 
 using System.Text;
 
-using MonoSecurity::Mono.Security;
-
 namespace System.Security.Cryptography.X509Certificates {
 
        public sealed class X509KeyUsageExtension : X509Extension {
@@ -91,14 +94,14 @@ namespace System.Security.Cryptography.X509Certificates {
 
                // methods
 
-               public override void CopyFrom (AsnEncodedData encodedData)
+               public override void CopyFrom (AsnEncodedData asnEncodedData)
                {
-                       if (encodedData == null)
-                               throw new ArgumentNullException ("encodedData");
+                       if (asnEncodedData == null)
+                               throw new ArgumentNullException ("asnEncodedData");
 
-                       X509Extension ex = (encodedData as X509Extension);
+                       X509Extension ex = (asnEncodedData as X509Extension);
                        if (ex == null)
-                               throw new ArgumentException (Locale.GetText ("Wrong type."), "encodedData");
+                               throw new ArgumentException (Locale.GetText ("Wrong type."), "asnEncodedData");
 
                        if (ex._oid == null)
                                _oid = new Oid (oid, friendlyName);