diff options
| author | Sebastien Pouliot <sebastien@ximian.com> | 2004-06-09 04:49:32 +0400 |
|---|---|---|
| committer | Sebastien Pouliot <sebastien@ximian.com> | 2004-06-09 04:49:32 +0400 |
| commit | 0e862bf88868593220db694d629aad0b1d2c5d8b (patch) | |
| tree | 98676585df63c7611a618453344912ed04258eac /mcs/class/Mono.Security | |
| parent | d41f63f69193beb133b998808d6c2d6623d05c17 (diff) | |
2004-06-08 Sebastien Pouliot <sebastien@ximian.com>
* StrongName.cs: Synch with corlib (the new code isn't even compiled)
in Mono.Security assembly.
svn path=/trunk/mcs/; revision=29074
Diffstat (limited to 'mcs/class/Mono.Security')
| -rw-r--r-- | mcs/class/Mono.Security/Mono.Security/ChangeLog | 5 | ||||
| -rw-r--r-- | mcs/class/Mono.Security/Mono.Security/StrongName.cs | 13 |
2 files changed, 18 insertions, 0 deletions
diff --git a/mcs/class/Mono.Security/Mono.Security/ChangeLog b/mcs/class/Mono.Security/Mono.Security/ChangeLog index a2ae1882129..2f02a5a836b 100644 --- a/mcs/class/Mono.Security/Mono.Security/ChangeLog +++ b/mcs/class/Mono.Security/Mono.Security/ChangeLog @@ -1,3 +1,8 @@ +2004-06-08 Sebastien Pouliot <sebastien@ximian.com> + + * StrongName.cs: Synch with corlib (the new code isn't even compiled) + in Mono.Security assembly. + 2004-05-19 Jesper Pedersen <jep@itplus.dk> * PKCS7.cs: Added SignedData.VerifySignature(AsymmetricAlgorithm aa). diff --git a/mcs/class/Mono.Security/Mono.Security/StrongName.cs b/mcs/class/Mono.Security/Mono.Security/StrongName.cs index f1ae174209b..2b133806a3b 100644 --- a/mcs/class/Mono.Security/Mono.Security/StrongName.cs +++ b/mcs/class/Mono.Security/Mono.Security/StrongName.cs @@ -425,9 +425,22 @@ namespace Mono.Security { } #if INSIDE_CORLIB + static object lockObject = new object (); + static bool initialized = false; + // We don't want a dependency on StrongNameManager in Mono.Security.dll static public bool IsAssemblyStrongnamed (string assemblyName) { + if (!initialized) { + lock (lockObject) { + if (!initialized) { + string config = Environment.GetMachineConfigPath (); + StrongNameManager.LoadConfig (config); + initialized = true; + } + } + } + try { // this doesn't load the assembly (well it unloads it ;) // http://weblogs.asp.net/nunitaddin/posts/9991.aspx |