diff options
| -rw-r--r-- | plugins/PluginUpdater/src/checksum.cpp | 197 | ||||
| -rw-r--r-- | tools/checksum/checksum.cpp | 111 |
2 files changed, 170 insertions, 138 deletions
diff --git a/plugins/PluginUpdater/src/checksum.cpp b/plugins/PluginUpdater/src/checksum.cpp index ae300a1f9b..657b8f6c93 100644 --- a/plugins/PluginUpdater/src/checksum.cpp +++ b/plugins/PluginUpdater/src/checksum.cpp @@ -13,11 +13,33 @@ #define RESULT_INVALID 50
#define RESULT_NONE 100
+
#define DEBUG_SECTIONS 1
#define DEBUG_REALLOCS 1
int debug = 0;
+static void PatchResourcesDirectory(PIMAGE_RESOURCE_DIRECTORY pIRD, BYTE* pBase);
+
+static void PatchResourceEntry(PIMAGE_RESOURCE_DIRECTORY_ENTRY pIRDE, BYTE* pBase)
+{
+ if ( pIRDE->DataIsDirectory )
+ PatchResourcesDirectory( PIMAGE_RESOURCE_DIRECTORY(pBase + pIRDE->OffsetToDirectory), pBase);
+}
+
+static void PatchResourcesDirectory(PIMAGE_RESOURCE_DIRECTORY pIRD, PBYTE pBase)
+{
+ UINT i;
+ pIRD->TimeDateStamp = 0;
+
+ PIMAGE_RESOURCE_DIRECTORY_ENTRY pIRDE = PIMAGE_RESOURCE_DIRECTORY_ENTRY(pIRD+1);
+ for ( i=0; i < pIRD->NumberOfNamedEntries; i++, pIRDE++ )
+ PatchResourceEntry(pIRDE, pBase);
+
+ for ( i=0; i < pIRD->NumberOfIdEntries; i++, pIRDE++ )
+ PatchResourceEntry(pIRDE, pBase);
+}
+
int CalculateModuleHash(const TCHAR *filename, char* szDest)
{
HANDLE hFile = INVALID_HANDLE_VALUE;
@@ -38,21 +60,25 @@ int CalculateModuleHash(const TCHAR *filename, char* szDest) // check minimum and maximum size
filesize = GetFileSize( hFile, &hsize );
- if ( !filesize || filesize == INVALID_FILE_SIZE || hsize) {
+ if ( !filesize || filesize == INVALID_FILE_SIZE || hsize )
+ {
CloseHandle( hFile );
return RESULT_INVALID;
}
- if (filesize < sizeof(IMAGE_DOS_HEADER) + sizeof(IMAGE_NT_HEADERS)) {
+ if ( filesize < sizeof(IMAGE_DOS_HEADER) + sizeof(IMAGE_NT_HEADERS))
+ {
CloseHandle( hFile );
return RESULT_NOTPE;
}
hMap = CreateFileMapping( hFile, NULL, PAGE_WRITECOPY, 0, 0, NULL );
+
if ( hMap )
ptr = (PBYTE)MapViewOfFile( hMap, FILE_MAP_COPY, 0, 0 ,0 );
- if ( ptr ) {
+ if ( ptr )
+ {
PIMAGE_DOS_HEADER pIDH = 0;
PIMAGE_NT_HEADERS pINTH = 0;
@@ -69,22 +95,22 @@ int CalculateModuleHash(const TCHAR *filename, char* szDest) else
if ( pINTH->Signature != IMAGE_NT_SIGNATURE )
res = RESULT_NOTPE;
- else {
+ else
+ {
machine = pINTH->FileHeader.Machine;
sections = pINTH->FileHeader.NumberOfSections;
if ( !sections )
res = RESULT_INVALID;
- else {
+ else
+ {
PIMAGE_DATA_DIRECTORY pIDD = 0;
PIMAGE_DEBUG_DIRECTORY pDBG = 0;
- DWORD dbgsize = 0;
- DWORD dbgvaddr = 0;
- DWORD expsize = 0;
- DWORD expvaddr = 0;
+ DWORD dbgSize = 0, dbgAddr = 0; // debug information
+ DWORD expSize = 0, expAddr = 0; // export table
+ DWORD resSize = 0, resAddr = 0; // resource directory
+ DWORD relocSize = 0, relocAddr = 0; // relocation table
PBYTE pRealloc = 0;
- DWORD realvaddr = 0;
- DWORD realsize = 0;
DWORD offset;
ULONGLONG base = 0;
@@ -109,127 +135,140 @@ int CalculateModuleHash(const TCHAR *filename, char* szDest) if ( pIDD ) {
// Debugging information entry
- dbgvaddr = pIDD[IMAGE_DIRECTORY_ENTRY_DEBUG].VirtualAddress;
- dbgsize = pIDD[IMAGE_DIRECTORY_ENTRY_DEBUG].Size;
+ dbgAddr = pIDD[IMAGE_DIRECTORY_ENTRY_DEBUG].VirtualAddress;
+ dbgSize = pIDD[IMAGE_DIRECTORY_ENTRY_DEBUG].Size;
// Export information entry
- expvaddr = pIDD[IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress;
- expsize = pIDD[IMAGE_DIRECTORY_ENTRY_EXPORT].Size;
+ expAddr = pIDD[IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress;
+ expSize = pIDD[IMAGE_DIRECTORY_ENTRY_EXPORT].Size;
+
+ // Resource directory
+ resAddr = pIDD[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress;
+ resSize = pIDD[IMAGE_DIRECTORY_ENTRY_RESOURCE].Size;
// Reallocation information entry
- realvaddr = pIDD[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress;
- realsize = pIDD[IMAGE_DIRECTORY_ENTRY_BASERELOC].Size;
+ relocAddr = pIDD[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress;
+ relocSize = pIDD[IMAGE_DIRECTORY_ENTRY_BASERELOC].Size;
}
- if ( dbgsize || expsize || realsize ) {
- DWORD idx = 0;
- PIMAGE_SECTION_HEADER pISH = 0;
-
- while ( idx < sections ) {
- pISH = (PIMAGE_SECTION_HEADER)( ptr + offset + idx * sizeof(IMAGE_SECTION_HEADER));
- if (((PBYTE)pISH + sizeof(IMAGE_SECTION_HEADER) > ptr + filesize ) || ( pISH->PointerToRawData + pISH->SizeOfRawData > filesize )) {
- res = RESULT_CORRUPTED;
- break;
- }
-
- // erase timestamp
- if (( dbgsize >= sizeof( IMAGE_DEBUG_DIRECTORY )) &&
- ( dbgvaddr >= pISH->VirtualAddress ) &&
- ( dbgvaddr + dbgsize <= pISH->VirtualAddress + pISH->SizeOfRawData ))
- {
- DWORD shift = dbgvaddr - pISH->VirtualAddress;
- pDBG = (PIMAGE_DEBUG_DIRECTORY)( ptr + shift + pISH->PointerToRawData );
+ // verify image integrity
+ for (DWORD idx=0; idx < sections; idx++)
+ {
+ PIMAGE_SECTION_HEADER pISH = (PIMAGE_SECTION_HEADER)( ptr + offset + idx * sizeof(IMAGE_SECTION_HEADER));
- pDBG->TimeDateStamp = 0;
- //ZeroMemory( ptr + pISH->PointerToRawData + shift, dbgsize );
- }
+ if (((PBYTE)pISH + sizeof(IMAGE_SECTION_HEADER) > ptr + filesize ) || ( pISH->PointerToRawData + pISH->SizeOfRawData > filesize ))
+ {
+ res = RESULT_CORRUPTED;
+ break;
+ }
- // erase export timestamp
- if (( expsize >= sizeof( IMAGE_EXPORT_DIRECTORY )) &&
- ( expvaddr >= pISH->VirtualAddress ) &&
- ( expvaddr + expsize <= pISH->VirtualAddress + pISH->SizeOfRawData ))
- {
- DWORD shift = expvaddr - pISH->VirtualAddress;
- PIMAGE_EXPORT_DIRECTORY pEXP = (PIMAGE_EXPORT_DIRECTORY)( ptr + shift + pISH->PointerToRawData );
+ // erase timestamp
+ if (( dbgSize >= sizeof( IMAGE_DEBUG_DIRECTORY )) &&
+ ( dbgAddr >= pISH->VirtualAddress ) &&
+ ( dbgAddr + dbgSize <= pISH->VirtualAddress + pISH->SizeOfRawData ))
+ {
+ DWORD shift = dbgAddr - pISH->VirtualAddress;
+ pDBG = (PIMAGE_DEBUG_DIRECTORY)( ptr + shift + pISH->PointerToRawData );
+ pDBG->TimeDateStamp = 0;
+ }
- pEXP->TimeDateStamp = 0;
- }
+ // erase export timestamp
+ if (( expSize >= sizeof( IMAGE_EXPORT_DIRECTORY )) &&
+ ( expAddr >= pISH->VirtualAddress ) &&
+ ( expAddr + expSize <= pISH->VirtualAddress + pISH->SizeOfRawData ))
+ {
+ DWORD shift = expAddr - pISH->VirtualAddress;
+ PIMAGE_EXPORT_DIRECTORY pEXP = (PIMAGE_EXPORT_DIRECTORY)( ptr + shift + pISH->PointerToRawData );
- // find realocation table
- if (( realsize >= sizeof( IMAGE_BASE_RELOCATION )) &&
- ( realvaddr >= pISH->VirtualAddress ) &&
- ( realvaddr + realsize <= pISH->VirtualAddress + pISH->SizeOfRawData ))
- {
- DWORD shift = realvaddr - pISH->VirtualAddress;
- pRealloc = ptr + shift + pISH->PointerToRawData;
- }
+ pEXP->TimeDateStamp = 0;
+ }
- idx++;
+ // find realocation table
+ if (( relocSize >= sizeof( IMAGE_BASE_RELOCATION )) &&
+ ( relocAddr >= pISH->VirtualAddress ) &&
+ ( relocAddr + relocSize <= pISH->VirtualAddress + pISH->SizeOfRawData ))
+ {
+ DWORD shift = relocAddr - pISH->VirtualAddress;
+ pRealloc = ptr + shift + pISH->PointerToRawData;
}
}
if ( res == RESULT_OK )
{
- PIMAGE_SECTION_HEADER pISH = 0;
- DWORD idx = 0;
-
mir_md5_state_t pms;
mir_md5_init( &pms );
- while ( idx < sections ) {
- pISH = (PIMAGE_SECTION_HEADER)( ptr + offset + idx * sizeof(IMAGE_SECTION_HEADER));
- if (((PBYTE)pISH + sizeof(IMAGE_SECTION_HEADER) > ptr + filesize ) || ( pISH->PointerToRawData + pISH->SizeOfRawData > filesize )) {
+ for (size_t idx=0; idx < sections; idx++)
+ {
+ PIMAGE_SECTION_HEADER pISH = (PIMAGE_SECTION_HEADER)( ptr + offset + idx * sizeof(IMAGE_SECTION_HEADER));
+
+ if (((PBYTE)pISH + sizeof(IMAGE_SECTION_HEADER) > ptr + filesize ) || ( pISH->PointerToRawData + pISH->SizeOfRawData > filesize ))
+ {
res = RESULT_CORRUPTED;
break;
}
// erase debug information
- if ( pDBG && ( pDBG->SizeOfData > 0 ) &&
- ( pDBG->PointerToRawData >= pISH->PointerToRawData ) &&
- ( pDBG->PointerToRawData + pDBG->SizeOfData <= pISH->PointerToRawData + pISH->SizeOfRawData ))
+ if ( pDBG && pDBG->SizeOfData > 0 &&
+ pDBG->PointerToRawData >= pISH->PointerToRawData &&
+ pDBG->PointerToRawData + pDBG->SizeOfData <= pISH->PointerToRawData + pISH->SizeOfRawData )
{
ZeroMemory( ptr + pDBG->PointerToRawData, pDBG->SizeOfData );
}
- // rebase to zero address
- if ( pRealloc ) {
- PIMAGE_BASE_RELOCATION pIBR = 0;
+ // patch resources
+ if ( resSize > 0 && resAddr >= pISH->VirtualAddress && resAddr + resSize <= pISH->VirtualAddress + pISH->SizeOfRawData )
+ {
+ DWORD shift = resAddr - pISH->VirtualAddress + pISH->PointerToRawData;
+ IMAGE_RESOURCE_DIRECTORY* pIRD = (IMAGE_RESOURCE_DIRECTORY*)( ptr + shift );
+ PatchResourcesDirectory(pIRD, ptr + shift);
+ }
- DWORD blocklen = realsize;
+ // rebase to zero address
+ if ( pRealloc )
+ {
+ DWORD blocklen = relocSize;
PWORD pw;
DWORD type;
- int len;
+ int len;
PBYTE pAddr;
DWORD shift;
DWORD addr;
- pIBR = (PIMAGE_BASE_RELOCATION)pRealloc;
- while( pIBR ) {
+ PIMAGE_BASE_RELOCATION pIBR = (PIMAGE_BASE_RELOCATION)pRealloc;
+ while( pIBR )
+ {
if (( pIBR->VirtualAddress >= pISH->VirtualAddress ) &&
- ( pIBR->VirtualAddress < pISH->VirtualAddress + pISH->SizeOfRawData ) &&
- ( pIBR->SizeOfBlock <= blocklen ))
+ ( pIBR->VirtualAddress < pISH->VirtualAddress + pISH->SizeOfRawData ) &&
+ ( pIBR->SizeOfBlock <= blocklen ))
{
shift = pIBR->VirtualAddress - pISH->VirtualAddress + pISH->PointerToRawData;
+
len = pIBR->SizeOfBlock - sizeof(IMAGE_BASE_RELOCATION);
+
pw = (PWORD)((PBYTE)pIBR + sizeof(IMAGE_BASE_RELOCATION));
- while( len > 0 ) {
+ while( len > 0 )
+ {
type = *pw >> 12;
+
addr = ( *pw & 0x0FFF );
+
pAddr = ptr + shift + addr;
switch( type ) {
case IMAGE_REL_BASED_HIGHLOW:
- if ( addr + pIBR->VirtualAddress + sizeof(DWORD) >= pISH->VirtualAddress + pISH->SizeOfRawData ) {
+ if ( addr + pIBR->VirtualAddress + sizeof(DWORD) >= pISH->VirtualAddress + pISH->SizeOfRawData )
+ {
len = 0;
break;
}
-
*(PDWORD)pAddr = (DWORD)((*(PDWORD)pAddr) - (DWORD)base );
break;
case IMAGE_REL_BASED_DIR64:
- if ( addr + pIBR->VirtualAddress + sizeof(ULONGLONG) >= pISH->VirtualAddress + pISH->SizeOfRawData ) {
+ if ( addr + pIBR->VirtualAddress + sizeof(ULONGLONG) >= pISH->VirtualAddress + pISH->SizeOfRawData )
+ {
len = 0;
break;
}
@@ -261,8 +300,6 @@ int CalculateModuleHash(const TCHAR *filename, char* szDest) }
mir_md5_append( &pms, ptr + pISH->PointerToRawData, pISH->SizeOfRawData );
-
- idx++;
}
if ( res == RESULT_OK ) {
diff --git a/tools/checksum/checksum.cpp b/tools/checksum/checksum.cpp index e8658140ae..9778a2c66c 100644 --- a/tools/checksum/checksum.cpp +++ b/tools/checksum/checksum.cpp @@ -1,5 +1,5 @@ -// Checksum Tool
+// Checksum Tool
// By Bio (C) 2012
#define _VERSION_ "3.1"
@@ -67,7 +67,7 @@ int PEChecksum( TCHAR *filename, mir_md5_byte_t digest[16] ) {
CloseHandle( hFile );
return RESULT_INVALID;
- }
+ }
if ( filesize < sizeof(IMAGE_DOS_HEADER) + sizeof(IMAGE_NT_HEADERS))
{
@@ -118,13 +118,13 @@ int PEChecksum( TCHAR *filename, mir_md5_byte_t digest[16] ) _ftprintf( stderr, _T("Build: unknown :-(\n"));
break;
}
- }
+ }
#endif
sections = pINTH->FileHeader.NumberOfSections;
-
+
if ( !sections )
res = RESULT_INVALID;
- else
+ else
{
PIMAGE_DATA_DIRECTORY pIDD = 0;
PIMAGE_DEBUG_DIRECTORY pDBG = 0;
@@ -136,34 +136,30 @@ int PEChecksum( TCHAR *filename, mir_md5_byte_t digest[16] ) DWORD offset;
ULONGLONG base = 0;
- // try to found correct offset independent of architectures
+ // try to found correct offset independent of architectures
offset = pIDH->e_lfanew + pINTH->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_NT_HEADERS) - sizeof(IMAGE_OPTIONAL_HEADER);
- if (( machine == IMAGE_FILE_MACHINE_I386 ) &&
+ if (( machine == IMAGE_FILE_MACHINE_I386 ) &&
( pINTH->FileHeader.SizeOfOptionalHeader >= sizeof(IMAGE_OPTIONAL_HEADER32)) &&
( pINTH->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC ))
{
- pIDD = (PIMAGE_DATA_DIRECTORY)((PBYTE)pINTH + offsetof( IMAGE_NT_HEADERS32, OptionalHeader.DataDirectory ));
- base = *(DWORD*)((PBYTE)pINTH + offsetof( IMAGE_NT_HEADERS32, OptionalHeader.ImageBase ));
+ pIDD = (PIMAGE_DATA_DIRECTORY)((PBYTE)pINTH + offsetof( IMAGE_NT_HEADERS32, OptionalHeader.DataDirectory ));
+ base = *(DWORD*)((PBYTE)pINTH + offsetof( IMAGE_NT_HEADERS32, OptionalHeader.ImageBase ));
}
- else
- if (( machine == IMAGE_FILE_MACHINE_AMD64 ) &&
+ else if (( machine == IMAGE_FILE_MACHINE_AMD64 ) &&
( pINTH->FileHeader.SizeOfOptionalHeader >= sizeof(IMAGE_OPTIONAL_HEADER64)) &&
( pINTH->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC ))
{
-
- pIDD = (PIMAGE_DATA_DIRECTORY)((PBYTE)pINTH + offsetof( IMAGE_NT_HEADERS64, OptionalHeader.DataDirectory ));
- base = *(ULONGLONG*)((PBYTE)pINTH + offsetof( IMAGE_NT_HEADERS64, OptionalHeader.ImageBase ));
+ pIDD = (PIMAGE_DATA_DIRECTORY)((PBYTE)pINTH + offsetof( IMAGE_NT_HEADERS64, OptionalHeader.DataDirectory ));
+ base = *(ULONGLONG*)((PBYTE)pINTH + offsetof( IMAGE_NT_HEADERS64, OptionalHeader.ImageBase ));
}
- else
- res = RESULT_CORRUPTED;
-
+ else res = RESULT_CORRUPTED;
+
#ifdef DEBUG_REALLOCS
- if ( debug )
+ if ( debug )
_ftprintf( stderr, _T("Image base is 0x%I64x \n"), base );
#endif
- if ( pIDD )
- {
+ if ( pIDD ) {
// Debugging information entry
dbgAddr = pIDD[IMAGE_DIRECTORY_ENTRY_DEBUG].VirtualAddress;
dbgSize = pIDD[IMAGE_DIRECTORY_ENTRY_DEBUG].Size;
@@ -179,7 +175,7 @@ int PEChecksum( TCHAR *filename, mir_md5_byte_t digest[16] ) // Reallocation information entry
relocAddr = pIDD[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress;
relocSize = pIDD[IMAGE_DIRECTORY_ENTRY_BASERELOC].Size;
- }
+ }
// verify image integrity
for (DWORD idx=0; idx < sections; idx++)
@@ -191,46 +187,46 @@ int PEChecksum( TCHAR *filename, mir_md5_byte_t digest[16] ) res = RESULT_CORRUPTED;
break;
}
-
+
// erase timestamp
- if (( dbgSize >= sizeof( IMAGE_DEBUG_DIRECTORY )) &&
- ( dbgAddr >= pISH->VirtualAddress ) &&
+ if (( dbgSize >= sizeof( IMAGE_DEBUG_DIRECTORY )) &&
+ ( dbgAddr >= pISH->VirtualAddress ) &&
( dbgAddr + dbgSize <= pISH->VirtualAddress + pISH->SizeOfRawData ))
{
DWORD shift = dbgAddr - pISH->VirtualAddress;
- pDBG = (PIMAGE_DEBUG_DIRECTORY)( ptr + shift + pISH->PointerToRawData );
+ pDBG = (PIMAGE_DEBUG_DIRECTORY)( ptr + shift + pISH->PointerToRawData );
pDBG->TimeDateStamp = 0;
#ifdef DEBUG_SECTIONS
- if ( debug )
+ if ( debug )
_ftprintf( stderr, _T("Found debug section entry at 0x%08X (%d), data at 0x%08X (%d)\n"), pISH->PointerToRawData + shift, dbgSize, pDBG->PointerToRawData, pDBG->SizeOfData );
-#endif
+#endif
}
// erase export timestamp
- if (( expSize >= sizeof( IMAGE_EXPORT_DIRECTORY )) &&
- ( expAddr >= pISH->VirtualAddress ) &&
+ if (( expSize >= sizeof( IMAGE_EXPORT_DIRECTORY )) &&
+ ( expAddr >= pISH->VirtualAddress ) &&
( expAddr + expSize <= pISH->VirtualAddress + pISH->SizeOfRawData ))
{
DWORD shift = expAddr - pISH->VirtualAddress;
- PIMAGE_EXPORT_DIRECTORY pEXP = (PIMAGE_EXPORT_DIRECTORY)( ptr + shift + pISH->PointerToRawData );
+ PIMAGE_EXPORT_DIRECTORY pEXP = (PIMAGE_EXPORT_DIRECTORY)( ptr + shift + pISH->PointerToRawData );
pEXP->TimeDateStamp = 0;
#ifdef DEBUG_SECTIONS
- if ( debug )
+ if ( debug )
_ftprintf( stderr, _T("Found export section entry at 0x%08X\n"), pISH->PointerToRawData + shift );
#endif
}
// find realocation table
- if (( relocSize >= sizeof( IMAGE_BASE_RELOCATION )) &&
- ( relocAddr >= pISH->VirtualAddress ) &&
+ if (( relocSize >= sizeof( IMAGE_BASE_RELOCATION )) &&
+ ( relocAddr >= pISH->VirtualAddress ) &&
( relocAddr + relocSize <= pISH->VirtualAddress + pISH->SizeOfRawData ))
{
DWORD shift = relocAddr - pISH->VirtualAddress;
- pRealloc = ptr + shift + pISH->PointerToRawData;
+ pRealloc = ptr + shift + pISH->PointerToRawData;
#ifdef DEBUG_SECTIONS
- if ( debug )
+ if ( debug )
_ftprintf( stderr, _T("Found reallocation table entry at 0x%08X (%d)\n"), pISH->PointerToRawData + shift, relocSize );
#endif
}
@@ -252,8 +248,8 @@ int PEChecksum( TCHAR *filename, mir_md5_byte_t digest[16] ) }
// erase debug information
- if ( pDBG && pDBG->SizeOfData > 0 &&
- pDBG->PointerToRawData >= pISH->PointerToRawData &&
+ if ( pDBG && pDBG->SizeOfData > 0 &&
+ pDBG->PointerToRawData >= pISH->PointerToRawData &&
pDBG->PointerToRawData + pDBG->SizeOfData <= pISH->PointerToRawData + pISH->SizeOfRawData )
{
ZeroMemory( ptr + pDBG->PointerToRawData, pDBG->SizeOfData );
@@ -268,7 +264,7 @@ int PEChecksum( TCHAR *filename, mir_md5_byte_t digest[16] ) }
// rebase to zero address
- if ( pRealloc )
+ if ( pRealloc )
{
DWORD blocklen = relocSize;
PWORD pw;
@@ -281,8 +277,8 @@ int PEChecksum( TCHAR *filename, mir_md5_byte_t digest[16] ) PIMAGE_BASE_RELOCATION pIBR = (PIMAGE_BASE_RELOCATION)pRealloc;
while( pIBR )
{
- if (( pIBR->VirtualAddress >= pISH->VirtualAddress ) &&
- ( pIBR->VirtualAddress < pISH->VirtualAddress + pISH->SizeOfRawData ) &&
+ if (( pIBR->VirtualAddress >= pISH->VirtualAddress ) &&
+ ( pIBR->VirtualAddress < pISH->VirtualAddress + pISH->SizeOfRawData ) &&
( pIBR->SizeOfBlock <= blocklen ))
{
shift = pIBR->VirtualAddress - pISH->VirtualAddress + pISH->PointerToRawData;
@@ -291,7 +287,7 @@ int PEChecksum( TCHAR *filename, mir_md5_byte_t digest[16] ) pw = (PWORD)((PBYTE)pIBR + sizeof(IMAGE_BASE_RELOCATION));
#ifdef DEBUG_REALLOCS
- if ( debug )
+ if ( debug )
_ftprintf( stderr, _T("Realloc block at %08X (%d)\n"), pIBR->VirtualAddress, pIBR->SizeOfBlock );
#endif
@@ -333,13 +329,13 @@ int PEChecksum( TCHAR *filename, mir_md5_byte_t digest[16] ) case IMAGE_REL_BASED_ABSOLUTE:
// stop processing
len = 0;
- break;
+ break;
case IMAGE_REL_BASED_HIGH:
case IMAGE_REL_BASED_LOW:
case IMAGE_REL_BASED_HIGHADJ:
#ifdef DEBUG_REALLOCS
- if ( debug )
+ if ( debug )
_ftprintf( stderr, _T("Unexpected block type %d\n"), type );
#endif
break;
@@ -349,7 +345,7 @@ int PEChecksum( TCHAR *filename, mir_md5_byte_t digest[16] ) if ( debug )
_ftprintf( stderr, _T("Unknown block type %d\n"), type );
#endif
- break;
+ break;
}
len -= sizeof(WORD);
@@ -357,7 +353,7 @@ int PEChecksum( TCHAR *filename, mir_md5_byte_t digest[16] ) }
}
- blocklen -= pIBR->SizeOfBlock;
+ blocklen -= pIBR->SizeOfBlock;
if ( blocklen > sizeof(IMAGE_BASE_RELOCATION))
pIBR = (PIMAGE_BASE_RELOCATION)((PBYTE)pIBR + pIBR->SizeOfBlock );
else
@@ -365,9 +361,9 @@ int PEChecksum( TCHAR *filename, mir_md5_byte_t digest[16] ) }
}
#ifdef DEBUG_SECTIONS
- if ( debug )
+ if ( debug )
{
- int i;
+ int i;
mir_md5_byte_t digest2[16];
mir_md5_state_t pms2;
@@ -386,20 +382,19 @@ int PEChecksum( TCHAR *filename, mir_md5_byte_t digest[16] ) mir_md5_append( &pms, ptr + pISH->PointerToRawData, pISH->SizeOfRawData );
}
- if ( res == RESULT_OK )
+ if ( res == RESULT_OK )
mir_md5_finish( &pms, digest );
}
}
}
}
- else
- res = RESULT_READERROR;
+ else res = RESULT_READERROR;
- if ( ptr )
+ if ( ptr )
UnmapViewOfFile( ptr );
if ( hMap )
- CloseHandle( hMap );
+ CloseHandle( hMap );
CloseHandle( hFile );
@@ -412,7 +407,7 @@ TCHAR* trtrim( TCHAR *str ) return NULL;
TCHAR* p = _tcschr( str, 0 );
- while ( --p >= str )
+ while ( --p >= str )
{
switch ( *p ) {
case L' ': case L'\t': case L'\n': case L'\r':
@@ -432,7 +427,7 @@ int process(TCHAR *filename) res = PEChecksum( filename, digest);
- switch(res) {
+ switch(res) {
case RESULT_NOTFOUND:
_ftprintf( stderr, _T("'%s'... not found!\n"), filename );
break;
@@ -460,7 +455,7 @@ int process(TCHAR *filename) return res;
}
-
+
int _tmain( int argc, TCHAR *argv[] )
{
TCHAR buf[ MAX_PATH ];
@@ -473,7 +468,7 @@ int _tmain( int argc, TCHAR *argv[] ) if ( argc > 1 )
{
WIN32_FIND_DATA ffd;
- HANDLE hFind = INVALID_HANDLE_VALUE;
+ HANDLE hFind = INVALID_HANDLE_VALUE;
for ( i = 1; i < argc; i++ )
{
@@ -499,9 +494,9 @@ int _tmain( int argc, TCHAR *argv[] ) continue;
}
- hFind = FindFirstFile( argv[i], &ffd );
+ hFind = FindFirstFile( argv[i], &ffd );
- while( hFind != INVALID_HANDLE_VALUE )
+ while( hFind != INVALID_HANDLE_VALUE )
{
if ( ! ( ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ))
{
|