Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add Dispack file-level filter in the libarchive chain.
Add new file type for Win32-PE executables (Dispack). Reset file type flag after filter processing for better compression. Fix array index handling for file type list.
- Loading branch information
Showing
11 changed files
with
456 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,151 @@ | ||
| /* | ||
| * This file is a part of Pcompress, a chunked parallel multi- | ||
| * algorithm lossless compression and decompression program. | ||
| * | ||
| * Copyright (C) 2014 Moinak Ghosh. All rights reserved. | ||
| * Use is subject to license terms. | ||
| * | ||
| * This program is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU Lesser General Public | ||
| * License as published by the Free Software Foundation; either | ||
| * version 3 of the License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public | ||
| * License along with this program. | ||
| * If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| * moinakg@belenix.org, http://moinakg.wordpress.com/ | ||
| * | ||
| */ | ||
|
|
||
| #include <sys/types.h> | ||
| #include <unistd.h> | ||
| #include <string.h> | ||
| #include <stdlib.h> | ||
| #include <stdio.h> | ||
| #include <errno.h> | ||
|
|
||
| #include "utils.h" | ||
| #include "winsupport.h" | ||
| #include "types.hpp" | ||
| #include "dis.hpp" | ||
|
|
||
| #ifdef __cplusplus | ||
| extern "C" { | ||
| #endif | ||
|
|
||
| typedef unsigned char uchar_t; | ||
|
|
||
| #pragma pack(1) | ||
| struct FileHeader | ||
| { | ||
| sU32 SizeBefore; // number of bytes before start of code section | ||
| sU32 SizeAfter; // number of bytes after code section | ||
| sU32 SizeTransformed; // size of transformed code section | ||
| sU32 SizeOriginal; // size of untransformed code section | ||
| sU32 Origin; // virtual address of first byte | ||
| }; | ||
| #pragma pack() | ||
|
|
||
| size_t | ||
| dispack_filter_encode(uchar_t *inData, size_t len, uchar_t **out_buf) | ||
| { | ||
| uchar_t *pos; | ||
| FileHeader hdr; | ||
|
|
||
| *out_buf = (uchar_t *)malloc(len); | ||
| if (*out_buf == NULL) | ||
| return (0); | ||
|
|
||
| // assume the input file is a PE executable. | ||
| IMAGE_DOS_HEADER *doshdr = (IMAGE_DOS_HEADER *) inData; | ||
| IMAGE_NT_HEADERS *nthdr = (IMAGE_NT_HEADERS *) (inData + doshdr->e_lfanew); | ||
|
|
||
| if (nthdr->FileHeader.Machine != IMAGE_FILE_MACHINE_I386 || | ||
| nthdr->OptionalHeader.Magic != IMAGE_NT_OPTIONAL_HDR32_MAGIC) { | ||
| // Only 32-bit PE files for x86 supported | ||
| return (0); | ||
| } | ||
|
|
||
| sU32 imageBase = nthdr->OptionalHeader.ImageBase; | ||
| sU32 codeStart = nthdr->OptionalHeader.BaseOfCode; | ||
| sU32 codeSize = nthdr->OptionalHeader.SizeOfCode; | ||
| sU32 fileOffs = 0; // find file offset of first section | ||
|
|
||
| // find section containing code | ||
| IMAGE_SECTION_HEADER *sec = IMAGE_FIRST_SECTION(nthdr); | ||
| for (sInt i=0;i<nthdr->FileHeader.NumberOfSections;i++) { | ||
| if (codeStart >= sec[i].VirtualAddress && codeStart < | ||
| sec[i].VirtualAddress + sec[i].SizeOfRawData) | ||
| fileOffs = sec[i].PointerToRawData + (codeStart - sec[i].VirtualAddress); | ||
| } | ||
|
|
||
| if (fileOffs == 0) { | ||
| // Code section not found! | ||
| return (0); | ||
| } | ||
|
|
||
| // Keep space for header | ||
| pos = *out_buf + sizeof (hdr); | ||
|
|
||
| // transform code | ||
| sU32 transSize = len - sizeof (hdr); | ||
| if (DisFilter(inData + fileOffs, codeSize, imageBase + codeStart, pos, transSize) == NULL) | ||
| return (0); | ||
| pos += transSize; | ||
|
|
||
| // Now plonk the header | ||
| hdr.SizeBefore = fileOffs; | ||
| hdr.SizeAfter = len - (fileOffs + codeSize); | ||
| hdr.SizeTransformed = transSize; | ||
| hdr.SizeOriginal = codeSize; | ||
| hdr.Origin = imageBase + codeStart; | ||
| memcpy(*out_buf, &hdr, sizeof (hdr)); | ||
|
|
||
| // Copy rest of the data | ||
| memcpy(pos, inData, hdr.SizeBefore); | ||
| pos += hdr.SizeBefore; | ||
| memcpy(pos, inData + (fileOffs + codeSize), hdr.SizeAfter); | ||
| pos += hdr.SizeAfter; | ||
|
|
||
| return (pos - *out_buf); | ||
| } | ||
|
|
||
| size_t | ||
| dispack_filter_decode(uchar_t *inData, size_t len, uchar_t **out_buf) | ||
| { | ||
| uchar_t *decoded; | ||
| FileHeader *hdr = (FileHeader *)inData; | ||
|
|
||
| sU8 *transformed = inData + sizeof (FileHeader); | ||
| sU8 *before = transformed + hdr->SizeTransformed; | ||
| sU8 *after = before + hdr->SizeBefore; | ||
|
|
||
| // alloc buffer for unfiltered code | ||
| *out_buf = (uchar_t *)malloc(len); | ||
| if (*out_buf == NULL) | ||
| return (0); | ||
|
|
||
| decoded = *out_buf; | ||
| memcpy(decoded, before, hdr->SizeBefore); | ||
| decoded += hdr->SizeBefore; | ||
|
|
||
| if (!DisUnFilter(transformed, hdr->SizeTransformed, decoded, | ||
| hdr->SizeOriginal, hdr->Origin)) { | ||
| return (0); | ||
| } | ||
| decoded += hdr->SizeOriginal; | ||
| memcpy(decoded, after, hdr->SizeAfter); | ||
| decoded += hdr->SizeAfter; | ||
|
|
||
| return (decoded - *out_buf); | ||
| } | ||
|
|
||
| #ifdef __cplusplus | ||
| } | ||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.