Add missing init call and rename methods

This commit is contained in:
de4dot 2012-08-09 01:20:02 +02:00
parent 752b28dc4c
commit 72c22d7566

View File

@ -174,17 +174,17 @@ namespace de4dot.code.deobfuscators.Confuser {
do { do {
constantsDecrypterV18.find(); constantsDecrypterV18.find();
if (constantsDecrypterV18.Detected) { if (constantsDecrypterV18.Detected) {
initializeConstantsDecrypter(); initializeConstantsDecrypterV18();
break; break;
} }
constantsDecrypterV17.find(); constantsDecrypterV17.find();
if (constantsDecrypterV17.Detected) { if (constantsDecrypterV17.Detected) {
initializeConstantsDecrypter17(); initializeConstantsDecrypterV17();
break; break;
} }
constantsDecrypterV15.find(); constantsDecrypterV15.find();
if (constantsDecrypterV15.Detected) { if (constantsDecrypterV15.Detected) {
initializeConstantsDecrypter15(); initializeConstantsDecrypterV15();
break; break;
} }
} while (false); } while (false);
@ -314,8 +314,9 @@ namespace de4dot.code.deobfuscators.Confuser {
base.deobfuscateBegin(); base.deobfuscateBegin();
removeObfuscatorAttribute(); removeObfuscatorAttribute();
initializeConstantsDecrypter(); initializeConstantsDecrypterV18();
initializeConstantsDecrypter15(); initializeConstantsDecrypterV17();
initializeConstantsDecrypterV15();
initializeStringDecrypter(); initializeStringDecrypter();
if (jitMethodsDecrypter != null) { if (jitMethodsDecrypter != null) {
@ -408,7 +409,7 @@ namespace de4dot.code.deobfuscators.Confuser {
} }
bool hasInitializedConstantsDecrypter = false; bool hasInitializedConstantsDecrypter = false;
void initializeConstantsDecrypter() { void initializeConstantsDecrypterV18() {
if (hasInitializedConstantsDecrypter || (constantsDecrypterV18 == null || !constantsDecrypterV18.Detected)) if (hasInitializedConstantsDecrypter || (constantsDecrypterV18 == null || !constantsDecrypterV18.Detected))
return; return;
hasInitializedConstantsDecrypter = true; hasInitializedConstantsDecrypter = true;
@ -434,12 +435,12 @@ namespace de4dot.code.deobfuscators.Confuser {
} }
bool hasInitializedConstantsDecrypter15 = false; bool hasInitializedConstantsDecrypter15 = false;
void initializeConstantsDecrypter15() { void initializeConstantsDecrypterV15() {
initialize(constantsDecrypterV15, ref hasInitializedConstantsDecrypter15); initialize(constantsDecrypterV15, ref hasInitializedConstantsDecrypter15);
} }
bool hasInitializedConstantsDecrypter17 = false; bool hasInitializedConstantsDecrypter17 = false;
void initializeConstantsDecrypter17() { void initializeConstantsDecrypterV17() {
initialize(constantsDecrypterV17, ref hasInitializedConstantsDecrypter17); initialize(constantsDecrypterV17, ref hasInitializedConstantsDecrypter17);
} }