diff options
| author | Sebastien Pouliot <sebastien@ximian.com> | 2004-08-13 17:24:48 +0400 |
|---|---|---|
| committer | Sebastien Pouliot <sebastien@ximian.com> | 2004-08-13 17:24:48 +0400 |
| commit | 2e7fdc582406126993f5c2101464d3f56b5c0de3 (patch) | |
| tree | 8ab9758c685b33a49250ec65b65431f606f8af23 /mcs | |
| parent | fa37552b8d7451e8eb36a74f7c523478464a0cbd (diff) | |
2004-08-13 Sebastien Pouliot <sebastien@ximian.com>
* AssemblyBuilder.cs: (Partly) Fix delay-signing issue (#56621) when
MCS is used on the MS runtime (other part of the fix is for MCS).
svn path=/branches/mono-1-0/mcs/; revision=32305
Diffstat (limited to 'mcs')
| -rwxr-xr-x | mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs | 8 | ||||
| -rw-r--r-- | mcs/class/corlib/System.Reflection.Emit/ChangeLog | 5 |
2 files changed, 13 insertions, 0 deletions
diff --git a/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs index ebe86410469..344395be1a3 100755 --- a/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs +++ b/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs @@ -131,8 +131,16 @@ namespace System.Reflection.Emit { } if (n.KeyPair != null) { + // full keypair is available (for signing) sn = n.KeyPair.StrongName (); } + else { + // public key is available (for delay-signing) + byte[] pk = n.GetPublicKey (); + if ((pk != null) && (pk.Length > 0)) { + sn = new Mono.Security.StrongName (pk); + } + } basic_init (this); } diff --git a/mcs/class/corlib/System.Reflection.Emit/ChangeLog b/mcs/class/corlib/System.Reflection.Emit/ChangeLog index 4a3fa12c3b0..0f117fa51cf 100644 --- a/mcs/class/corlib/System.Reflection.Emit/ChangeLog +++ b/mcs/class/corlib/System.Reflection.Emit/ChangeLog @@ -1,3 +1,8 @@ +2004-08-13 Sebastien Pouliot <sebastien@ximian.com> + + * AssemblyBuilder.cs: (Partly) Fix delay-signing issue (#56621) when + MCS is used on the MS runtime (other part of the fix is for MCS). + 2004-07-24 Martin Baulig <martin@ximian.com> * TypeBuilder.cs (TypeBuilder.UnspecifiedTypeSize): Set this to 0 |