Rename classes
This commit is contained in:
parent
9791e63e51
commit
9bf30e165c
|
@ -142,12 +142,12 @@
|
||||||
<Compile Include="deobfuscators\Eazfuscator_NET\DecrypterType.cs" />
|
<Compile Include="deobfuscators\Eazfuscator_NET\DecrypterType.cs" />
|
||||||
<Compile Include="deobfuscators\Eazfuscator_NET\Deobfuscator.cs" />
|
<Compile Include="deobfuscators\Eazfuscator_NET\Deobfuscator.cs" />
|
||||||
<Compile Include="deobfuscators\Eazfuscator_NET\EfUtils.cs" />
|
<Compile Include="deobfuscators\Eazfuscator_NET\EfUtils.cs" />
|
||||||
<Compile Include="deobfuscators\Eazfuscator_NET\GetManifestResourceStreamRestorer.cs" />
|
<Compile Include="deobfuscators\Eazfuscator_NET\GetManifestResourceRestorer.cs" />
|
||||||
<Compile Include="deobfuscators\Eazfuscator_NET\ResourceResolver.cs" />
|
<Compile Include="deobfuscators\Eazfuscator_NET\ResourceResolver.cs" />
|
||||||
<Compile Include="deobfuscators\Eazfuscator_NET\StringDecrypter.cs" />
|
<Compile Include="deobfuscators\Eazfuscator_NET\StringDecrypter.cs" />
|
||||||
<Compile Include="deobfuscators\Eazfuscator_NET\VersionDetector.cs" />
|
<Compile Include="deobfuscators\Eazfuscator_NET\VersionDetector.cs" />
|
||||||
<Compile Include="deobfuscators\ExceptionLoggerRemover.cs" />
|
<Compile Include="deobfuscators\ExceptionLoggerRemover.cs" />
|
||||||
<Compile Include="deobfuscators\GetManifestResourceStreamRestorerBase.cs" />
|
<Compile Include="deobfuscators\GetManifestResourceRestorerBase.cs" />
|
||||||
<Compile Include="deobfuscators\Goliath_NET\ArrayDecrypter.cs" />
|
<Compile Include="deobfuscators\Goliath_NET\ArrayDecrypter.cs" />
|
||||||
<Compile Include="deobfuscators\Goliath_NET\ArrayValueInliner.cs" />
|
<Compile Include="deobfuscators\Goliath_NET\ArrayValueInliner.cs" />
|
||||||
<Compile Include="deobfuscators\Goliath_NET\DecrypterBase.cs" />
|
<Compile Include="deobfuscators\Goliath_NET\DecrypterBase.cs" />
|
||||||
|
|
|
@ -36,7 +36,7 @@ namespace de4dot.code.deobfuscators.CodeVeil {
|
||||||
MethodDefinition resTypeCtor;
|
MethodDefinition resTypeCtor;
|
||||||
TypeDefinition resourceFlagsType;
|
TypeDefinition resourceFlagsType;
|
||||||
TypeDefinition resourceEnumeratorType;
|
TypeDefinition resourceEnumeratorType;
|
||||||
GetManifestResourceStreamRestorerBase getManifestResourceStreamRestorer;
|
GetManifestResourceRestorerBase getManifestResourceRestorer;
|
||||||
|
|
||||||
public bool CanRemoveTypes {
|
public bool CanRemoveTypes {
|
||||||
get {
|
get {
|
||||||
|
@ -78,7 +78,7 @@ namespace de4dot.code.deobfuscators.CodeVeil {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void initialize() {
|
public void initialize() {
|
||||||
getManifestResourceStreamRestorer = new GetManifestResourceStreamRestorerBase(module);
|
getManifestResourceRestorer = new GetManifestResourceRestorerBase(module);
|
||||||
findEncryptedResourceStreamType();
|
findEncryptedResourceStreamType();
|
||||||
findEncryptedResourceSet();
|
findEncryptedResourceSet();
|
||||||
findEncryptedResourceReader();
|
findEncryptedResourceReader();
|
||||||
|
@ -264,8 +264,8 @@ namespace de4dot.code.deobfuscators.CodeVeil {
|
||||||
if (!findManifestResourceStreamMethods(type, out getManifestResourceStreamMethodTmp1, out getManifestResourceStreamMethodTmp2))
|
if (!findManifestResourceStreamMethods(type, out getManifestResourceStreamMethodTmp1, out getManifestResourceStreamMethodTmp2))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
getManifestResourceStreamRestorer.GetStream1Method = getManifestResourceStreamMethodTmp1;
|
getManifestResourceRestorer.GetStream1Method = getManifestResourceStreamMethodTmp1;
|
||||||
getManifestResourceStreamRestorer.GetStream2Method = getManifestResourceStreamMethodTmp2;
|
getManifestResourceRestorer.GetStream2Method = getManifestResourceStreamMethodTmp2;
|
||||||
encryptedResourceStreamType = type;
|
encryptedResourceStreamType = type;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -355,7 +355,7 @@ namespace de4dot.code.deobfuscators.CodeVeil {
|
||||||
if (encryptedResourceStreamType == null)
|
if (encryptedResourceStreamType == null)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
getManifestResourceStreamRestorer.deobfuscate(blocks);
|
getManifestResourceRestorer.deobfuscate(blocks);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -54,7 +54,7 @@ namespace de4dot.code.deobfuscators.Eazfuscator_NET {
|
||||||
StringDecrypter stringDecrypter;
|
StringDecrypter stringDecrypter;
|
||||||
AssemblyResolver assemblyResolver;
|
AssemblyResolver assemblyResolver;
|
||||||
ResourceResolver resourceResolver;
|
ResourceResolver resourceResolver;
|
||||||
GetManifestResourceStreamRestorer getManifestResourceStreamRestorer;
|
GetManifestResourceRestorer getManifestResourceRestorer;
|
||||||
|
|
||||||
internal class Options : OptionsBase {
|
internal class Options : OptionsBase {
|
||||||
}
|
}
|
||||||
|
@ -129,8 +129,8 @@ namespace de4dot.code.deobfuscators.Eazfuscator_NET {
|
||||||
addResourceToBeRemoved(info.Resource, "Encrypted resources");
|
addResourceToBeRemoved(info.Resource, "Encrypted resources");
|
||||||
addModuleCctorInitCallToBeRemoved(resourceResolver.InitMethod);
|
addModuleCctorInitCallToBeRemoved(resourceResolver.InitMethod);
|
||||||
|
|
||||||
getManifestResourceStreamRestorer = new GetManifestResourceStreamRestorer(module);
|
getManifestResourceRestorer = new GetManifestResourceRestorer(module);
|
||||||
getManifestResourceStreamRestorer.find(DeobfuscatedFile, this);
|
getManifestResourceRestorer.find(DeobfuscatedFile, this);
|
||||||
|
|
||||||
dumpEmbeddedAssemblies();
|
dumpEmbeddedAssemblies();
|
||||||
}
|
}
|
||||||
|
@ -143,7 +143,7 @@ namespace de4dot.code.deobfuscators.Eazfuscator_NET {
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void deobfuscateMethodEnd(Blocks blocks) {
|
public override void deobfuscateMethodEnd(Blocks blocks) {
|
||||||
getManifestResourceStreamRestorer.deobfuscate(blocks);
|
getManifestResourceRestorer.deobfuscate(blocks);
|
||||||
base.deobfuscateMethodEnd(blocks);
|
base.deobfuscateMethodEnd(blocks);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -156,8 +156,8 @@ namespace de4dot.code.deobfuscators.Eazfuscator_NET {
|
||||||
addTypeToBeRemoved(assemblyResolver.Type, "Assembly resolver type");
|
addTypeToBeRemoved(assemblyResolver.Type, "Assembly resolver type");
|
||||||
addTypeToBeRemoved(assemblyResolver.OtherType, "Assembly resolver other type");
|
addTypeToBeRemoved(assemblyResolver.OtherType, "Assembly resolver other type");
|
||||||
addTypeToBeRemoved(resourceResolver.Type, "Resource resolver type");
|
addTypeToBeRemoved(resourceResolver.Type, "Resource resolver type");
|
||||||
addTypeToBeRemoved(getManifestResourceStreamRestorer.Type, "GetManifestResourceStream type");
|
addTypeToBeRemoved(getManifestResourceRestorer.Type, "GetManifestResourceStream type");
|
||||||
addResourceToBeRemoved(getManifestResourceStreamRestorer.Resource, "GetManifestResourceStream type resource");
|
addResourceToBeRemoved(getManifestResourceRestorer.Resource, "GetManifestResourceStream type resource");
|
||||||
|
|
||||||
fixInterfaces();
|
fixInterfaces();
|
||||||
base.deobfuscateEnd();
|
base.deobfuscateEnd();
|
||||||
|
|
|
@ -21,7 +21,7 @@ using Mono.Cecil;
|
||||||
using de4dot.blocks;
|
using de4dot.blocks;
|
||||||
|
|
||||||
namespace de4dot.code.deobfuscators.Eazfuscator_NET {
|
namespace de4dot.code.deobfuscators.Eazfuscator_NET {
|
||||||
class GetManifestResourceStreamRestorer : GetManifestResourceStreamRestorerBase {
|
class GetManifestResourceRestorer : GetManifestResourceRestorerBase {
|
||||||
TypeDefinition getManifestResourceStreamType;
|
TypeDefinition getManifestResourceStreamType;
|
||||||
EmbeddedResource getManifestResourceStreamTypeResource;
|
EmbeddedResource getManifestResourceStreamTypeResource;
|
||||||
|
|
||||||
|
@ -33,7 +33,7 @@ namespace de4dot.code.deobfuscators.Eazfuscator_NET {
|
||||||
get { return getManifestResourceStreamTypeResource; }
|
get { return getManifestResourceStreamTypeResource; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public GetManifestResourceStreamRestorer(ModuleDefinition module)
|
public GetManifestResourceRestorer(ModuleDefinition module)
|
||||||
: base(module) {
|
: base(module) {
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,7 +22,7 @@ using Mono.Cecil.Cil;
|
||||||
using de4dot.blocks;
|
using de4dot.blocks;
|
||||||
|
|
||||||
namespace de4dot.code.deobfuscators {
|
namespace de4dot.code.deobfuscators {
|
||||||
class GetManifestResourceStreamRestorerBase {
|
class GetManifestResourceRestorerBase {
|
||||||
protected ModuleDefinition module;
|
protected ModuleDefinition module;
|
||||||
protected MethodDefinition getManifestResourceStream1Method;
|
protected MethodDefinition getManifestResourceStream1Method;
|
||||||
protected MethodDefinition getManifestResourceStream2Method;
|
protected MethodDefinition getManifestResourceStream2Method;
|
||||||
|
@ -43,7 +43,7 @@ namespace de4dot.code.deobfuscators {
|
||||||
set { getManifestResourceNamesMethod = value; }
|
set { getManifestResourceNamesMethod = value; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public GetManifestResourceStreamRestorerBase(ModuleDefinition module) {
|
public GetManifestResourceRestorerBase(ModuleDefinition module) {
|
||||||
this.module = module;
|
this.module = module;
|
||||||
createGetManifestResourceStreamMethods();
|
createGetManifestResourceStreamMethods();
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user