[Test] Avoid MethodInfoTest.GetMethodBody failure when executed on a release (IL...

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

diff --git a/mcs/class/corlib/System.Security.Permissions/StrongNamePermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/StrongNamePermissionAttribute.cs
index 55509fb3060791e90b47a6de4e4f0c604b79bb03..c710c3d764b805782da7e24dddb91b68836c207b 100644 (file)
--- a/mcs/class/corlib/System.Security.Permissions/StrongNamePermissionAttribute.cs
+++ b/mcs/class/corlib/System.Security.Permissions/StrongNamePermissionAttribute.cs
@@ -1,15 +1,39 @@
 //
 // System.Security.Permissions.StrongNameIdentityPermissionAttribute.cs
 //
-// Duncan Mak <duncan@ximian.com>
+// Authors:
+//     Duncan Mak <duncan@ximian.com>
+//     Sebastien Pouliot  <sebastien@ximian.com>
 //
 // (C) 2002 Ximian, Inc.                       http://www.ximian.com
+// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
+using System.Globalization;
+using System.Runtime.InteropServices;
 
 namespace System.Security.Permissions {
 
+       [ComVisible (true)]
        [AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class |
                         AttributeTargets.Struct | AttributeTargets.Constructor |
                         AttributeTargets.Method, AllowMultiple=true, Inherited=false)]
@@ -22,23 +46,23 @@ namespace System.Security.Permissions {
                private string version;
                
                // Constructor
-               public StrongNameIdentityPermissionAttribute (SecurityAction action) : base (action) {}
+               public StrongNameIdentityPermissionAttribute (SecurityAction action) 
+                       : base (action)
+               {
+               }
                
                // Properties
-               public string Name
-               {
+               public string Name {
                        get { return name; }
                        set { name = value; }
                }
 
-               public string PublicKey
-               {
+               public string PublicKey {
                        get { return key; }
                        set { key = value; }
                }
 
-               public string Version
-               {
+               public string Version {
                        get { return version; }
                        set { version = value; }
                }
@@ -46,31 +70,27 @@ namespace System.Security.Permissions {
                // Methods
                public override IPermission CreatePermission ()
                {
+#if NET_2_1
+                       return null;
+#else
                        if (this.Unrestricted)
-                               throw new ArgumentException ("Unsupported PermissionState.Unrestricted");
+                               return new StrongNameIdentityPermission (PermissionState.Unrestricted);
 
-                       StrongNameIdentityPermission perm = null;
                        if ((name == null) && (key == null) && (version == null))
-                               perm = new StrongNameIdentityPermission (PermissionState.None);
-                       else {
-                               if (key == null)
-                                       throw new ArgumentException ("PublicKey is required");
+                               return new StrongNameIdentityPermission (PermissionState.None);
 
-                               byte[] keyblob = Convert.FromBase64String (key);
-                               StrongNamePublicKeyBlob blob = new StrongNamePublicKeyBlob (keyblob);
+                       if (key == null) {
+                               throw new ArgumentException (Locale.GetText (
+                                       "PublicKey is required"));
+                       }
+                       StrongNamePublicKeyBlob blob = StrongNamePublicKeyBlob.FromString (key);
                                
-                               Version v = null;
-                               if (version != null)
-                                       v = new Version (version);
-                               else
-                                       v = new Version ();
+                       Version v = null;
+                       if (version != null)
+                               v = new Version (version);
 
-                               if (name == null)
-                                       name = String.Empty;
-
-                               perm = new StrongNameIdentityPermission (blob, name, v);
-                       }
-                       return perm;
+                       return new StrongNameIdentityPermission (blob, name, v);
+#endif
                }
        }
 }