Don't statically decrypt strings if dynamic decryption is enabled, fixes

de4dot#140
AndrewChien · Mar 18, 2018 · e9f938a · e9f938a
1 parent 82c24c9
commit e9f938a
Showing 1 changed file with 15 additions and 11 deletions.
diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v4/Deobfuscator.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v4/Deobfuscator.cs
@@ -446,8 +446,10 @@ public override void DeobfuscateBegin() {
 			proxyCallFixer.FindDelegateCreator();
 			proxyCallFixer.Find();
 
-			stringDecrypter.Initialize(peImage, fileData, DeobfuscatedFile);
-			if (!stringDecrypter.Detected)
+			bool decryptStrings = Operations.DecryptStrings == OpDecryptString.Static;
+			if (decryptStrings)
+				stringDecrypter.Initialize(peImage, fileData, DeobfuscatedFile);
+			if (!stringDecrypter.Detected || !decryptStrings)
 				FreePEImage();
 			booleanDecrypter.Initialize(fileData, DeobfuscatedFile);
 			booleanValueInliner = new BooleanValueInliner();
@@ -459,15 +461,17 @@ public override void DeobfuscateBegin() {
 				});
 			}
 
-			foreach (var info in stringDecrypter.DecrypterInfos) {
-				staticStringInliner.Add(info.method, (method2, gim, args) => {
-					return stringDecrypter.Decrypt(method2, (int)args[0]);
-				});
-			}
-			if (stringDecrypter.OtherStringDecrypter != null) {
-				staticStringInliner.Add(stringDecrypter.OtherStringDecrypter, (method2, gim, args) => {
-					return stringDecrypter.Decrypt((string)args[0]);
-				});
+			if (decryptStrings) {
+				foreach (var info in stringDecrypter.DecrypterInfos) {
+					staticStringInliner.Add(info.method, (method2, gim, args) => {
+						return stringDecrypter.Decrypt(method2, (int)args[0]);
+					});
+				}
+				if (stringDecrypter.OtherStringDecrypter != null) {
+					staticStringInliner.Add(stringDecrypter.OtherStringDecrypter, (method2, gim, args) => {
+						return stringDecrypter.Decrypt((string)args[0]);
+					});
+				}
 			}
 			DeobfuscatedFile.StringDecryptersAdded();