handle IsTerminating.

[mono.git] / mcs / class / corlib / System.Security.Permissions / KeyContainerPermissionAccessEntry.cs

diff --git a/mcs/class/corlib/System.Security.Permissions/KeyContainerPermissionAccessEntry.cs b/mcs/class/corlib/System.Security.Permissions/KeyContainerPermissionAccessEntry.cs
index 67468829ac6687c69e8abc371ecf42ec97fdf7c4..6bf67d4847a1db31788dead1aa3358a39f7b695a 100644 (file)
--- a/mcs/class/corlib/System.Security.Permissions/KeyContainerPermissionAccessEntry.cs
+++ b/mcs/class/corlib/System.Security.Permissions/KeyContainerPermissionAccessEntry.cs
@@ -1,5 +1,5 @@
 //
-// System.Security.Permissions.KeyContainerPermissionAccessEntry class
+// System.Security.Permissions.KeyContainerPermissionAccessEntry.cs
 //
 // Author
 //     Sebastien Pouliot  <sebastien@ximian.com>
@@ -26,8 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
-
 using System.Globalization;
 using System.Runtime.InteropServices;
 using System.Security.Cryptography;
@@ -46,15 +44,15 @@ namespace System.Security.Permissions {
                private int _type;
 
 
-               public KeyContainerPermissionAccessEntry (CspParameters csp, KeyContainerPermissionFlags flags)
+               public KeyContainerPermissionAccessEntry (CspParameters parameters, KeyContainerPermissionFlags flags)
                {
-                       if (csp == null)
-                               throw new ArgumentNullException ("csp");
+                       if (parameters == null)
+                               throw new ArgumentNullException ("parameters");
 
-                       ProviderName = csp.ProviderName;
-                       ProviderType = csp.ProviderType;
-                       KeyContainerName = csp.KeyContainerName;
-                       KeySpec = csp.KeyNumber;
+                       ProviderName = parameters.ProviderName;
+                       ProviderType = parameters.ProviderType;
+                       KeyContainerName = parameters.KeyContainerName;
+                       KeySpec = parameters.KeyNumber;
                        Flags = flags;
                }
 
@@ -113,11 +111,11 @@ namespace System.Security.Permissions {
                }
 
 
-               public override bool Equals (object obj)
+               public override bool Equals (object o)
                {
-                       if (obj == null)
+                       if (o == null)
                                return false;
-                       KeyContainerPermissionAccessEntry kcpae = (obj as KeyContainerPermissionAccessEntry);
+                       KeyContainerPermissionAccessEntry kcpae = (o as KeyContainerPermissionAccessEntry);
                        if (kcpae == null)
                                return false;
                        if (_flags != kcpae._flags)
@@ -146,5 +144,3 @@ namespace System.Security.Permissions {
                }
        }
 }
-
-#endif