Merge pull request #3 from BC-SECURITY/compression_removal

Moved assembly compression to after compilation
BC-SECURITY · Oct 29, 2024 · f8796ea · f8796ea
2 parents 2ef3ae5 + 4c162b0
commit f8796ea
Show file tree

Hide file tree

Showing 14 changed files with 105 additions and 1,311 deletions.
diff --git a/EmpireCompiler/Core/Common.cs b/EmpireCompiler/Core/Common.cs
@@ -1,21 +1,14 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
-using System.Security.Cryptography;
-using System.Text;
+
 
 namespace EmpireCompiler.Core
 {
     public static class Common
     {
-        public static Encoding EmpireEncoding = Encoding.UTF8;
-        public static int AesIVLength = 16;
-        public static CipherMode AesCipherMode = CipherMode.CBC;
-        public static PaddingMode AesPaddingMode = PaddingMode.PKCS7;
-
         public static string EmpireDirectory = Assembly.GetExecutingAssembly().Location.Split("bin")[0].Split("EmpireCompiler.dll")[0];
         public static string EmpireDataDirectory = EmpireDirectory + "Data" + Path.DirectorySeparatorChar;
-        public static string EmpireDatabaseFile = EmpireDataDirectory + "covenant.db";
         public static string EmpireTempDirectory = EmpireDataDirectory + "Temp" + Path.DirectorySeparatorChar;
 
         public static string EmpireAssemblyReferenceDirectory = EmpireDataDirectory + "AssemblyReferences" + Path.DirectorySeparatorChar;
@@ -24,12 +17,10 @@ public static class Common
         public static string EmpireAssemblyReferenceNet45Directory = EmpireAssemblyReferenceDirectory + "net45" + Path.DirectorySeparatorChar;
         public static string EmpireEmbeddedResourcesDirectory = EmpireDataDirectory + "EmbeddedResources" + Path.DirectorySeparatorChar;
         public static string EmpireReferenceSourceLibraries = EmpireDataDirectory + "ReferenceSourceLibraries" + Path.DirectorySeparatorChar;
-        public static string EmpireSharpSploitDirectory = EmpireReferenceSourceLibraries + "SharpSploit" + Path.DirectorySeparatorChar;
-        public static string EmpireRubeusDirectory = EmpireReferenceSourceLibraries + "Rubeus" + Path.DirectorySeparatorChar;
 
         public static string EmpireTaskDirectory = EmpireDataDirectory + "Tasks" + Path.DirectorySeparatorChar;
         public static string EmpireTaskCSharpDirectory = EmpireTaskDirectory + "CSharp" + Path.DirectorySeparatorChar;
-        public static string EmpireTaskCSharpNetCoreApp30Directory = EmpireTaskCSharpDirectory + "netcoreapp3.0" + Path.DirectorySeparatorChar;
+        // public static string EmpireTaskCSharpNetCoreApp30Directory = EmpireTaskCSharpDirectory + "netcoreapp3.0" + Path.DirectorySeparatorChar;
         public static string EmpireTaskCSharpCompiledDirectory = EmpireTaskCSharpDirectory + "Compiled" + Path.DirectorySeparatorChar;
         public static string EmpireTaskCSharpCompiledNet35Directory = EmpireTaskCSharpCompiledDirectory + "net35" + Path.DirectorySeparatorChar;
         public static string EmpireTaskCSharpCompiledNet40Directory = EmpireTaskCSharpCompiledDirectory + "net40" + Path.DirectorySeparatorChar;

diff --git a/EmpireCompiler/Core/Compiler.cs b/EmpireCompiler/Core/Compiler.cs
@@ -125,9 +125,17 @@ private static byte[] CompileCSharpRoslyn(CsharpFrameworkCompilationRequest requ
                 .Select(R => MetadataReference.CreateFromFile(R.File))
                 .ToList();
 
+            string entryPointClass = "Program";
+
             // Use specified OutputKind and Platform
-            CSharpCompilationOptions options = new CSharpCompilationOptions(outputKind: request.OutputKind, optimizationLevel: OptimizationLevel.Release, platform: request.Platform, allowUnsafe: request.UnsafeCompile);
-            // Compile to obtain SemanticModel
+            CSharpCompilationOptions options = new CSharpCompilationOptions(
+                outputKind: request.OutputKind,
+                optimizationLevel: OptimizationLevel.Release,
+                platform: request.Platform,
+                allowUnsafe: request.UnsafeCompile,
+                mainTypeName: entryPointClass
+            );
+
             CSharpCompilation compilation = CSharpCompilation.Create(
                 request.AssemblyName == null ? Path.GetRandomFileName() : request.AssemblyName,
                 compilationTrees,
@@ -171,7 +179,6 @@ private static byte[] CompileCSharpRoslyn(CsharpFrameworkCompilationRequest requ
                 );
             }
 
-            // Emit compilation
             EmitResult emitResult;
             byte[] ILbytes = null;
             using (var ms = new MemoryStream())
@@ -184,7 +191,8 @@ private static byte[] CompileCSharpRoslyn(CsharpFrameworkCompilationRequest requ
                     }).Where(ER => ER.Enabled).Select(ER =>
                     {
                         return new ResourceDescription(ER.Name, () => File.OpenRead(ER.File), true);
-                    }).ToList()
+                    }).ToList(),
+                    cancellationToken: default
                 );
                 if (emitResult.Success)
                 {

diff --git a/EmpireCompiler/Core/Context.cs b/EmpireCompiler/Core/Context.cs