change registration

SsageParuders · Jul 30, 2022 · 323855c · 323855c
1 parent 214d722
commit 323855c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/Obfuscation/src/BogusControlFlow.cpp b/Obfuscation/src/BogusControlFlow.cpp
@@ -169,7 +169,7 @@ STATISTIC(NumAddedBasicBlocks, "e. Number of added basic blocks in this module")
 STATISTIC(FinalNumBasicBlocks, "f. Final number of basic blocks in this module");
 
 // Options for the pass
-const int defaultObfRate = 100, defaultObfTime = 4;
+const int defaultObfRate = 70, defaultObfTime = 2;
 
 static cl::opt<int> ObfProbRate("bcf_prob", cl::desc("Choose the probability [%] each basic blocks will be obfuscated by the -bcf pass"), cl::value_desc("probability rate"), cl::init(defaultObfRate), cl::Optional);
 

diff --git a/Obfuscation/src/FunctionWrapper.cpp b/Obfuscation/src/FunctionWrapper.cpp
@@ -14,7 +14,7 @@
  */
 #include "FunctionWrapper.h"
 
-static cl::opt<int> ProbRate("fw_prob",cl::desc("Choose the probability [%] For Each CallSite To Be Obfuscated By FunctionWrapper"),cl::value_desc("Probability Rate"), cl::init(100), cl::Optional);
+static cl::opt<int> ProbRate("fw_prob",cl::desc("Choose the probability [%] For Each CallSite To Be Obfuscated By FunctionWrapper"),cl::value_desc("Probability Rate"), cl::init(50), cl::Optional);
 
 static cl::opt<int> ObfTimes("fw_times",cl::desc("Choose how many time the FunctionWrapper pass loop on a CallSite"),cl::value_desc("Number of Times"), cl::init(3), cl::Optional);
 

diff --git a/Obfuscation/src/PMRegistration.cpp b/Obfuscation/src/PMRegistration.cpp
@@ -18,7 +18,7 @@ llvm::PassPluginLibraryInfo getSsagePluginInfo() {
   return {
     LLVM_PLUGIN_API_VERSION, "Ssage", LLVM_VERSION_STRING,
         [](PassBuilder &PB) {
-            outs() << "Version is " << 12 << "\n";
+            outs() << "Version is " << 14 << "\n";
             // for opt
             PB.registerPipelineParsingCallback(
               [&](StringRef Name, FunctionPassManager &FPM,
@@ -60,16 +60,22 @@ llvm::PassPluginLibraryInfo getSsagePluginInfo() {
                     MPM.addPass(StringEncryptionPass(false)); // 先进行字符串加密 出现字符串加密基本块以后 再进行基本块分割和其他混淆 加大解密难度
                     MPM.addPass(FunctionWrapperPass(false)); // 函数包装
                     MPM.addPass(IndirectBranchPass(false)); // 间接指令
-            });
-            // 自动注册 需要添加 -O1 参数 然则可能部分pass不生效
-            PB.registerVectorizerStartEPCallback(
-                [](llvm::FunctionPassManager &FPM, // 函数Pass 作用于某个函数内
-                   llvm::OptimizationLevel Level){
+                    llvm::FunctionPassManager FPM;
                     FPM.addPass(SplitBasicBlockPass(false));  // 优先进行基本块分割
-                    FPM.addPass(FlatteningPass(false));       // 对于控制流平坦化 不提前开启LowerSwitch 只在控制流平坦化内调用LegacyLowerSwitch
                     FPM.addPass(BogusControlFlowPass(false)); // 虚假控制流
+                    FPM.addPass(FlatteningPass(false));       // 对于控制流平坦化 不提前开启LowerSwitch 只在控制流平坦化内调用LegacyLowerSwitch
+                    MPM.addPass(createModuleToFunctionPassAdaptor(std::move(FPM)));
             });
-            outs() << "";
+            // 这里的注册时机不好 启用以下方案 改用上面的方案
+            // 自动注册 需要添加 -O1 参数 然则可能部分pass不生效
+            // PB.registerVectorizerStartEPCallback(
+            //     [](llvm::FunctionPassManager &FPM, // 函数Pass 作用于某个函数内
+            //        llvm::OptimizationLevel Level){
+            //         FPM.addPass(SplitBasicBlockPass(false));  // 优先进行基本块分割
+            //         FPM.addPass(FlatteningPass(false));       // 对于控制流平坦化 不提前开启LowerSwitch 只在控制流平坦化内调用LegacyLowerSwitch
+            //         FPM.addPass(BogusControlFlowPass(false)); // 虚假控制流
+            // });
+            outs() << "Made By SsageParuders\n";
         }};
 }