Mirror
/
CyberChef
mirror of https://github.com/gchq/CyberChef.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rectified magic bytes for MACHO extractor

This commit is contained in:
n1073645 2019-11-15 09:21:46 +00:00
parent 7c72871c02
commit 7c25e29515
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/lib/FileSignatures.mjs
View File

@ -2745,7 +2745,7 @@ export function extractMACHO(bytes, offset) {
* @returns {bool}
*/
function isMagic64(magic) {
return magic === MHCIGAM64 || magic === MHCIGAM64;
return magic === MHCIGAM64 || magic === MHMAGIC64;
}
@ -2821,16 +2821,16 @@ export function extractMACHO(bytes, offset) {
const MHCIGAM64 = "207250237254";
const MHMAGIC64 = "254237250207";
const MHCIGAM = "206250237254";
const LCSEGEMENT64 = 0x19;
const LCSEGEMENT = 0x1;
const stream = new Stream(bytes.slice(offset));
const magic = stream.getBytes(4).join("");
const is64 = isMagic64(magic);
const isSwap = shouldSwapBytes(magic) ? "le" : "be";
// Move to the end of the final segment.
stream.moveTo(dumpMachHeader(stream, is64, isSwap));
stream.moveTo(dumpMachHeader(stream, isMagic64(magic), shouldSwapBytes(magic) ? "le" : "be"));
return stream.carve();
}