Merge remote branch 'upstream/master'

[mono.git] / mono / metadata / assembly.c

diff --git a/mono/metadata/assembly.c b/mono/metadata/assembly.c
index 335adc83f1b7ab49248d184dbffbd4b031f4c28c..482762d0e1a213d9a113743cd28905e159aa3aa4 100644 (file)
--- a/mono/metadata/assembly.c
+++ b/mono/metadata/assembly.c
@@ -112,6 +112,7 @@ static const AssemblyVersionMap framework_assemblies [] = {
        {"System.Runtime.Serialization.Formatters.Soap", 0},
        {"System.Security", 0},
        {"System.ServiceProcess", 0},
+       {"System.Transactions", 2},
        {"System.Web", 0},
        {"System.Web.Abstractions", 2},
        {"System.Web.Mobile", 0},
@@ -1657,7 +1658,15 @@ parse_public_key (const gchar *key, gchar** pubkey)
        keylen = strlen (key) >> 1;
        if (keylen < 1)
                return FALSE;
-       
+
+       /* allow the ECMA standard key */
+       if (strcmp (key, "00000000000000000400000000000000") == 0) {
+               if (pubkey) {
+                       arr = g_strdup ("b77a5c561934e089");
+                       *pubkey = arr;
+               }
+               return TRUE;
+       }
        val = g_ascii_xdigit_value (key [0]) << 4;
        val |= g_ascii_xdigit_value (key [1]);
        switch (val) {