jory/upx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Only pack w/ -f PE files that force integrity check

Browse Source
This commit is contained in:
bitraid
2020-10-31 19:53:33 +02:00
parent e03310fcc6
commit 3e30839501
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pefile.cpp
+13 -6
View File
@@ -2108,8 +2108,7 @@ void PeFile::readSectionHeaders(unsigned objs, unsigned sizeof_ih)
} }
void PeFile::checkHeaderValues(unsigned subsystem, unsigned mask, void PeFile::checkHeaderValues(unsigned subsystem, unsigned mask,
unsigned ih_entry, unsigned ih_filealign, unsigned ih_entry, unsigned ih_filealign)
unsigned ih_dllflags)
{ {
if ((1u << subsystem) & ~mask) if ((1u << subsystem) & ~mask)
{ {
@@ -2133,9 +2132,6 @@ void PeFile::checkHeaderValues(unsigned subsystem, unsigned mask,
if (ih_filealign < 0x200) if (ih_filealign < 0x200)
throwCantPack("filealign < 0x200 is not yet supported"); throwCantPack("filealign < 0x200 is not yet supported");
if (ih_dllflags & IMAGE_DLLCHARACTERISTICS_CONTROL_FLOW_GUARD)
throwCantPack("CFGuard enabled PE files are not supported");
} }
unsigned PeFile::handleStripRelocs(upx_uint64_t ih_imagebase, unsigned PeFile::handleStripRelocs(upx_uint64_t ih_imagebase,
@@ -2245,7 +2241,18 @@ void PeFile::pack0(OutputFile *fo, ht &ih, ht &oh,
readSectionHeaders(objs, sizeof(ih)); readSectionHeaders(objs, sizeof(ih));
if (!opt->force && handleForceOption()) if (!opt->force && handleForceOption())
throwCantPack("unexpected value in PE header (try --force)"); throwCantPack("unexpected value in PE header (try --force)");
checkHeaderValues(ih.subsystem, subsystem_mask, ih.entry, ih.filealign, ih.dllflags);
if (ih.dllflags & IMAGE_DLLCHARACTERISTICS_CONTROL_FLOW_GUARD)
throwCantPack("CFGuard enabled PE files are not supported");
if (ih.dllflags & IMAGE_DLL_CHARACTERISTICS_FORCE_INTEGRITY)
{
if (opt->force)
ih.dllflags &= ~IMAGE_DLL_CHARACTERISTICS_FORCE_INTEGRITY;
else
throwCantPack("image forces integrity check (use --force to remove)");
}
checkHeaderValues(ih.subsystem, subsystem_mask, ih.entry, ih.filealign);
//remove certificate directory entry //remove certificate directory entry
if (IDSIZE(PEDIR_SEC)) if (IDSIZE(PEDIR_SEC))
src/pefile.h
+1 -2
View File
@@ -54,8 +54,7 @@ protected:
unsigned readSections(unsigned objs, unsigned usize, unsigned readSections(unsigned objs, unsigned usize,
unsigned ih_filealign, unsigned ih_datasize); unsigned ih_filealign, unsigned ih_datasize);
void checkHeaderValues(unsigned subsystem, unsigned mask, void checkHeaderValues(unsigned subsystem, unsigned mask,
unsigned ih_entry, unsigned ih_filealign, unsigned ih_entry, unsigned ih_filealign);
unsigned ih_dllflags);
unsigned handleStripRelocs(upx_uint64_t ih_imagebase, unsigned handleStripRelocs(upx_uint64_t ih_imagebase,
upx_uint64_t default_imagebase, upx_uint64_t default_imagebase,
unsigned dllflags); unsigned dllflags);