update v1.41(fix bug & error)

Author: SummerofOrange

O&Z_IL2CPP_Security/O&Z_IL2CPP_Security.csproj

@@ -24,4 +24,14 @@
     <None Remove="README.md" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\O&amp;Z_Obfuscator\OZ_Obfuscator.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="dnlib">
+      <HintPath>..\O&amp;Z_Obfuscator\plugin\dnlib.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
 </Project>

O&Z_IL2CPP_Security/Progarm.cs

@@ -3,7 +3,10 @@
 using System.Text;
 using System.Security.Cryptography;
 using O_Z_IL2CPP_Security.LitJson;
+using OZ_Obfus.obfuscators;
 using System.Diagnostics;
+using OZ_Obfuscator.Ofbuscators;
+using OZ_Obfus;
 
 List<byte[]> StringLiteraBytes = new List<byte[]>();
 List<byte[]> StringLiteraBytes_Crypted = new List<byte[]>();
@@ -128,8 +131,8 @@ void _Crypt()
     StringLiteraBytes_Crypted = Crypt.Cryptstring(StringLiteraBytes,jsonManager.index.key);
     byte[] allstring = metadata.GetAllStringFromMeta();
     Console.WriteLine("正在构建新的Metadata文件...");
-    Stream stream = metadata.SetCryptedStreamToMetadata(StringLiteraBytes_Crypted, Crypt.CryptWithSkipNULL(allstring,(byte)Tools.CheckNull(jsonManager.index.key), jsonManager.index.key),ver);
-    byte[] tmp = Tools.StreamToBytes(stream);
+    Stream stream = metadata.SetCryptedStreamToMetadata(StringLiteraBytes_Crypted, Crypt.CryptWithSkipNULL(allstring,(byte)O_Z_IL2CPP_Security.Tools.CheckNull(jsonManager.index.key), jsonManager.index.key),ver);
+    byte[] tmp = O_Z_IL2CPP_Security.Tools.StreamToBytes(stream);
     Console.WriteLine("正在写入文件...");
     File.WriteAllBytes(args[2], tmp);
     Console.WriteLine("Done!");
@@ -159,14 +162,14 @@ void _Generate()
     if (jsonManager.index.Version == "24.4")
     {
         src = File.ReadAllText("src-res/" + jsonManager.index.Version + "/MetadataCache.cpp");
-        cpp = new CPP(src, IL2CPP_Version.V24_4, jsonManager.index.key, (byte)Tools.CheckNull(jsonManager.index.key));
+        cpp = new CPP(src, IL2CPP_Version.V24_4, jsonManager.index.key, (byte)O_Z_IL2CPP_Security.Tools.CheckNull(jsonManager.index.key));
         File.WriteAllText("Generation/" + jsonManager.index.Version + "/libil2cpp/vm/MetadataCache.cpp", cpp.retsrc);
         File.WriteAllLines("Generation/" + jsonManager.index.Version + "/libil2cpp/il2cpp-metadata.h", File.ReadAllLines("src-res/" + jsonManager.index.Version + "/il2cpp-metadata.h"));
     }
     else if (jsonManager.index.Version == "28")
     {
         src = File.ReadAllText("src-res/" + jsonManager.index.Version + "/GlobalMetadata.cpp");
-        cpp = new CPP(src, IL2CPP_Version.V24_4, jsonManager.index.key, (byte)Tools.CheckNull(jsonManager.index.key));
+        cpp = new CPP(src, IL2CPP_Version.V24_4, jsonManager.index.key, (byte)O_Z_IL2CPP_Security.Tools.CheckNull(jsonManager.index.key));
         File.WriteAllText("Generation/" + jsonManager.index.Version + "/libil2cpp/vm/GlobalMetadata.cpp", cpp.retsrc);
         File.WriteAllLines("Generation/" + jsonManager.index.Version + "/libil2cpp/vm/GlobalMetadataFileInternals.h", File.ReadAllLines("src-res/" + jsonManager.index.Version + "/GlobalMetadataFileInternals.h"));
     }
@@ -211,22 +214,26 @@ void Help()
 }
 void MonoObfus()
 {
-    string args = "";
-    args +=OpenFilePath;
+    AssemblyLoader loader = new AssemblyLoader(OpenFilePath);
     if (jsonManager.index.Obfus.ControlFlow == 1)
-        args += " --ControlFlow";
+    {
+        ControlFlow controlFlow = new ControlFlow(loader.Module);
+        controlFlow.Execute();
+    }
     if (jsonManager.index.Obfus.NumObfus == 1)
-        args += " --NumObfus";
-    if(jsonManager.index.Obfus.LocalVariables2Field==1)
-        args += " --LocalVariables2Field";
+    {
+        NumObfus numObfus = new NumObfus(loader.Module);
+        numObfus.Execute();
+    }
+    if (jsonManager.index.Obfus.LocalVariables2Field == 1)
+    {
+        LocalVariables2Field localVariables2Field = new LocalVariables2Field(loader.Module);
+        localVariables2Field.Execute();
+    }
     if (jsonManager.index.Obfus.StrCrypter == 1)
-        args += " --StrCrypter";
-    if(string.Compare(args,OpenFilePath)!=0)
     {
-        Process process = new Process();
-        process.StartInfo.FileName = "OZ_Obfuscator.exe";
-        process.StartInfo.Arguments = args;
-        process.Start();
+        StrCrypter strCrypter = new StrCrypter(loader.Module);
+        strCrypter.Execute();
     }
-    
+        loader.Save();
 }

O&Z_IL2CPP_Security/Properties/launchSettings.json

@@ -18,7 +18,7 @@
     },
     "Obfus": {
       "commandName": "Project",
-      "commandLineArgs": "\"C:\\Users\\22864\\Desktop\\2019Testbuild\\O&Z_2019_4_32_f1_Data\\Managed\\Assembly-CSharp.bak.dll\" MonoObfus"
+      "commandLineArgs": "\"C:\\Users\\22864\\Desktop\\END_AUTO V2\\END_Data\\Managed\\Assembly-CSharp.dll.bak\" MonoObfus"
     }
   }
 }

O&Z_Obfuscator/OZ_Obfuscator.csproj

@@ -5,7 +5,7 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{5C48CBD8-78BC-4789-B851-71170FFF0662}</ProjectGuid>
-    <OutputType>Exe</OutputType>
+    <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>OZ_Obfuscator</RootNamespace>
     <AssemblyName>OZ_Obfuscator</AssemblyName>
@@ -48,7 +48,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject />

O&Z_Obfuscator/OZ_Obfuscator.csproj.user

@@ -11,4 +11,7 @@
     <FallbackCulture>zh-CN</FallbackCulture>
     <VerifyUploadedFiles>false</VerifyUploadedFiles>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+    <StartArguments>“C:\Users\22864\Desktop\END_AUTO V2\END_Data\Managed\Assembly-CSharp.dll” --ControlFlow --NumObfus --LocalVariables2Field --StrCrypter</StartArguments>
+  </PropertyGroup>
 </Project>