2003-10-17 Zoltan Varga <vargaz@freemail.hu>

	* AssemblyBuilder.cs: Moved loading of the public key file into
	managed code from reflection.c.

svn path=/trunk/mcs/; revision=19133

diff --git a/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs
index e2b71189c387b35f5a0a5971a7627a4e02c4f3e2..666f5d4e31483f1650b74fc878c64105461b5e97 100755 (executable)
--- a/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs
@@ -35,7 +35,7 @@ namespace System.Reflection.Emit {
                private string dir;
                private CustomAttributeBuilder[] cattrs;
                private MonoResource[] resources;
-               string keyfile;
+               byte[] public_key;
                string version;
                string culture;
                uint algid;
@@ -435,7 +435,15 @@ namespace System.Reflection.Emit {
                                data = customBuilder.Data;
                                pos = 2;
                                len = CustomAttributeBuilder.decode_len (data, pos, out pos);
-                               keyfile = CustomAttributeBuilder.string_from_bytes (data, pos, len);
+                               string keyfile_name = CustomAttributeBuilder.string_from_bytes (data, pos, len);
+                               using (FileStream fs = new FileStream (keyfile_name, FileMode.Open)) {
+                                       byte[] snkeypair = new byte [fs.Length];
+                                       fs.Read (snkeypair, 0, snkeypair.Length);
+
+                                       /* FIXME: Extract public key from the keypair */
+                                       public_key = snkeypair;
+                               }
+                               return;
                        } else if (attrname == "System.Reflection.AssemblyCultureAttribute") {
                                data = customBuilder.Data;
                                pos = 2;

diff --git a/mcs/class/corlib/System.Reflection.Emit/ChangeLog b/mcs/class/corlib/System.Reflection.Emit/ChangeLog
index 346e6af849db7ebbb6702d5b9bc8a34725a3b006..ebe80de8e49616ef5134efe03b5d4f42c1b0776c 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/ChangeLog
+++ b/mcs/class/corlib/System.Reflection.Emit/ChangeLog
@@ -1,5 +1,8 @@
 2003-10-17  Zoltan Varga  <vargaz@freemail.hu>
 
+       * AssemblyBuilder.cs: Moved loading of the public key file into
+       managed code from reflection.c.
+       
        * AssemblyBuilder.cs: Set cultureInfo and version from the AssemblyName
        passed to the constructor.