Set AssemblyDefinition::PublicKey when generating AsmResolver assembl…

…ies (SamboyCoding#390)
ds5678 · Dec 11, 2024 · 896d6c3 · 896d6c3
1 parent edbb994
commit 896d6c3
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 4 deletions.
diff --git a/Cpp2IL.Core/OutputFormats/AsmResolverDummyDllOutputFormat.cs b/Cpp2IL.Core/OutputFormats/AsmResolverDummyDllOutputFormat.cs
@@ -179,8 +179,10 @@ private static AssemblyDefinition BuildStubAssembly(AssemblyAnalysisContext asse
 
         var ourAssembly = new AssemblyDefinition(assemblyNameString, version)
         {
-            HashAlgorithm = (AssemblyHashAlgorithm)assemblyDefinition.AssemblyName.hash_alg, Attributes = (AssemblyAttributes)assemblyDefinition.AssemblyName.flags, Culture = assemblyDefinition.AssemblyName.Culture,
-            //TODO find a way to set hash? or not needed
+            HashAlgorithm = (AssemblyHashAlgorithm)assemblyDefinition.AssemblyName.hash_alg,
+            Attributes = (AssemblyAttributes)assemblyDefinition.AssemblyName.flags,
+            Culture = assemblyDefinition.AssemblyName.Culture,
+            PublicKey = assemblyDefinition.AssemblyName.PublicKey,
         };
 
         //Setting the corlib module allows element types in references to that assembly to be set correctly without us having to manually set them.

diff --git a/LibCpp2IL/ClassReadingBinaryReader.cs b/LibCpp2IL/ClassReadingBinaryReader.cs
@@ -302,7 +302,8 @@ protected internal byte[] ReadByteArrayAtRawAddressNoLock(long offset, int count
         if (offset != -1)
             Position = offset;
 
-        var initialPos = Position;
+        if (count == 0)
+            return [];
 
         try
         {

diff --git a/LibCpp2IL/Metadata/Il2CppAssemblyNameDefinition.cs b/LibCpp2IL/Metadata/Il2CppAssemblyNameDefinition.cs
@@ -24,7 +24,28 @@ public class Il2CppAssemblyNameDefinition : ReadableClass
     public string Name => LibCpp2IlMain.TheMetadata!.GetStringFromIndex(nameIndex);
     public string Culture => LibCpp2IlMain.TheMetadata!.GetStringFromIndex(cultureIndex);
 
-    public string PublicKey => LibCpp2IlMain.TheMetadata!.GetStringFromIndex(publicKeyIndex);
+    public byte[]? PublicKey
+    {
+        get
+        {
+            var result = LibCpp2IlMain.TheMetadata!.GetByteArrayFromIndex(publicKeyIndex);
+            return result.Length == 0 ? null : result;
+        }
+    }
+
+    /// <summary>
+    /// This returns the public key token as a byte array, or null if the token is 0.
+    /// </summary>
+    /// <remarks>
+    /// Returning null is necessary to match the behavior of AsmResolver.
+    /// </remarks>
+    public byte[]? PublicKeyToken
+    {
+        get
+        {
+            return publicKeyToken == default ? null : BitConverter.GetBytes(publicKeyToken);
+        }
+    }
 
     public string HashValue => LibCpp2IlMain.MetadataVersion > 24.3f ? "NULL" : LibCpp2IlMain.TheMetadata!.GetStringFromIndex(hashValueIndex);
 

diff --git a/LibCpp2IL/Metadata/Il2CppMetadata.cs b/LibCpp2IL/Metadata/Il2CppMetadata.cs
@@ -411,6 +411,18 @@ public int GetDefaultValueFromIndex(int index)
         return metadataHeader.fieldAndParameterDefaultValueDataOffset + index;
     }
 
+    /// <summary>
+    /// Read a byte array from the string data section of the metadata.
+    /// </summary>
+    /// <param name="index">The offset relative to the start of the string section.</param>
+    /// <returns>The </returns>
+    public byte[] GetByteArrayFromIndex(int index)
+    {
+        var offset = metadataHeader.stringOffset + index;
+        var count = ReadUnityCompressedUIntAtRawAddr(offset, out var bytesRead);
+        return ReadByteArrayAtRawAddress(offset + bytesRead, (int)count);
+    }
+
     private ConcurrentDictionary<int, string> _cachedStrings = new ConcurrentDictionary<int, string>();
 
     public string GetStringFromIndex(int index)