Skip to content

B
binwalk
Commit a3c4c779 by devttys0
Options

Fixed signature bugs

parent 26138bb9
Showing with 39 additions and 39 deletions
src/magic/archives
...@@ -195,11 +195,11 @@ ...@@ -195,11 +195,11 @@
# For example the LaserJet 5L driver puts the "PJL ENTER LANGUAGE" in line 10 # For example the LaserJet 5L driver puts the "PJL ENTER LANGUAGE" in line 10
# From: Uwe Bonnes <bon@elektron.ikp.physik.th-darmstadt.de> # From: Uwe Bonnes <bon@elektron.ikp.physik.th-darmstadt.de>
# #
0 string \033%-12345X@PJL HP Printer Job Language data 0 string \033%-12345X@PJL HP Printer Job Language data, "
>&0 string >\0 "%s" >0 string >\0 %s
>>&0 string >\0 "%s" >>128 string >\0 %s
>>>&0 string >\0 "%s" >>>256 string >\0 %s
>>>>&0 string >\0 "%s" >0 byte x "
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# #
......
src/magic/console
...@@ -77,15 +77,15 @@ ...@@ -77,15 +77,15 @@
0 string XBEH Microsoft Xbox executable (XBE), 0 string XBEH Microsoft Xbox executable (XBE),
## probabilistic checks whether signed or not ## probabilistic checks whether signed or not
>0x0004 ulelong =0x0 >0x0004 ulelong =0x0
>>&2 ulelong !0x0 \b, invalid >>2 ulelong !0x0 \b, invalid
>>&2 ulelong =0x0 >>2 ulelong =0x0
>>>&2 ulelong !0x0 \b, invalid >>>2 ulelong !0x0 \b, invalid
>>>&2 ulelong =0x0 \b, not signed >>>2 ulelong =0x0 \b, not signed
>0x0004 ulelong >0 >0x0004 ulelong >0
>>&2 ulelong =0x0 \b, invalid >>2 ulelong =0x0 \b, invalid
>>&2 ulelong >0 >>2 ulelong >0
>>>&2 ulelong =0x0 \b, invalid >>>2 ulelong =0x0 \b, invalid
>>>&2 ulelong >0 \b, signed >>>2 ulelong >0 \b, signed
>0x0104 lelong <0 \b, invalid base address >0x0104 lelong <0 \b, invalid base address
## expect base address of 0x10000 ## expect base address of 0x10000
>0x0104 ulelong =0x10000 >0x0104 ulelong =0x10000
......
src/magic/crypto
...@@ -39,13 +39,13 @@ ...@@ -39,13 +39,13 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Mavroyanopoulos Nikos <nmav@hellug.gr> # Mavroyanopoulos Nikos <nmav@hellug.gr>
# mcrypt: file(1) magic for mcrypt 2.2.x; # mcrypt: file(1) magic for mcrypt 2.2.x;
0 string \0m\3 mcrypt 2.5 encrypted data, #0 string \0m\3 mcrypt 2.5 encrypted data,
>4 byte 0 invalid #>4 byte 0 invalid
>4 string >\0 algorithm: "%s", #>4 string >\0 algorithm: "%s",
>>&1 leshort <1 invalid #>>&1 leshort <1 invalid
>>&1 leshort >0 keysize: %d bytes, #>>&1 leshort >0 keysize: %d bytes,
>>>&0 byte 0 invalid #>>>&0 byte 0 invalid
>>>&0 string >\0 mode: "%s", #>>>&0 string >\0 mode: "%s",
0 string \0m\2 mcrypt 2.2 encrypted data, 0 string \0m\2 mcrypt 2.2 encrypted data,
>3 byte 0 algorithm: blowfish-448, >3 byte 0 algorithm: blowfish-448,
......
src/magic/filesystems
...@@ -39,8 +39,8 @@ ...@@ -39,8 +39,8 @@
# EFS2 file system - jojo@utulsa.edu # EFS2 file system - jojo@utulsa.edu
0 lelong 0x53000000 EFS2 Qualcomm filesystem super block, little endian, 0 lelong 0x53000000 EFS2 Qualcomm filesystem super block, little endian,
>8 string !EFSSuper invalid, >8 string !EFSSuper invalid,
>4 leshort &1 NAND >4 leshort&0x01 1 NAND
>4 leshort ^1 NOR >4 leshort&0x01 0 NOR
>4 leshort x version 0x%x, >4 leshort x version 0x%x,
>24 lelong x %d blocks, >24 lelong x %d blocks,
>16 lelong x 0x%x pages per block, >16 lelong x 0x%x pages per block,
...@@ -48,8 +48,8 @@ ...@@ -48,8 +48,8 @@
0 belong 0x53000000 EFS2 Qualcomm filesystem super block, big endian, 0 belong 0x53000000 EFS2 Qualcomm filesystem super block, big endian,
>8 string !SSFErepu invalid, >8 string !SSFErepu invalid,
>4 beshort &1 NAND >4 beshort&0x01 1 NAND
>4 beshort ^1 NOR >4 beshort&0x01 0 NOR
>4 beshort x version 0x%x, >4 beshort x version 0x%x,
>24 belong x %d blocks, >24 belong x %d blocks,
>16 belong x 0x%x pages per block, >16 belong x 0x%x pages per block,
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
>>40 bequad x \b{file-size:%lld} >>40 bequad x \b{file-size:%lld}
>4 belong x %d inodes, >4 belong x %d inodes,
>28 beshort >3 >28 beshort >3
>>12 belong blocksize: %d bytes, >>12 belong x blocksize: %d bytes,
>28 beshort <2 >28 beshort <2
>>32 beshort x blocksize: %d bytes, >>32 beshort x blocksize: %d bytes,
>28 beshort 2 >28 beshort 2
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
>>40 lequad x {file-size:%lld} >>40 lequad x {file-size:%lld}
>4 lelong x %d inodes, >4 lelong x %d inodes,
>28 leshort >3 >28 leshort >3
>>12 lelong blocksize: %d bytes, >>12 lelong x blocksize: %d bytes,
>28 leshort <2 >28 leshort <2
>>32 leshort x blocksize: %d bytes, >>32 leshort x blocksize: %d bytes,
>28 leshort 2 >28 leshort 2
...@@ -266,7 +266,7 @@ ...@@ -266,7 +266,7 @@
>>40 bequad x {file-size:%lld} >>40 bequad x {file-size:%lld}
>4 belong x %d inodes, >4 belong x %d inodes,
>28 beshort >3 >28 beshort >3
>>12 belong blocksize: %d bytes, >>12 belong x blocksize: %d bytes,
>28 beshort <2 >28 beshort <2
>>32 beshort x blocksize: %d bytes, >>32 beshort x blocksize: %d bytes,
>28 beshort 2 >28 beshort 2
...@@ -311,7 +311,7 @@ ...@@ -311,7 +311,7 @@
>>40 bequad x {file-size:%lld} >>40 bequad x {file-size:%lld}
>4 belong x %d inodes, >4 belong x %d inodes,
>28 beshort >3 >28 beshort >3
>>12 belong blocksize: %d bytes, >>12 belong x blocksize: %d bytes,
>28 beshort <2 >28 beshort <2
>>32 beshort x blocksize: %d bytes, >>32 beshort x blocksize: %d bytes,
>28 beshort 2 >28 beshort 2
...@@ -356,7 +356,7 @@ ...@@ -356,7 +356,7 @@
>>40 bequad x {file-size:%lld} >>40 bequad x {file-size:%lld}
>4 belong x %d inodes, >4 belong x %d inodes,
>28 beshort >3 >28 beshort >3
>>12 belong blocksize: %d bytes, >>12 belong x blocksize: %d bytes,
>28 beshort <2 >28 beshort <2
>>32 beshort x blocksize: %d bytes, >>32 beshort x blocksize: %d bytes,
>28 beshort 2 >28 beshort 2
...@@ -401,7 +401,7 @@ ...@@ -401,7 +401,7 @@
>>40 lequad x {file-size:%lld} >>40 lequad x {file-size:%lld}
>4 lelong x %d inodes, >4 lelong x %d inodes,
>28 leshort >3 >28 leshort >3
>>12 lelong blocksize: %d bytes, >>12 lelong x blocksize: %d bytes,
>28 leshort <2 >28 leshort <2
>>32 leshort x blocksize: %d bytes, >>32 leshort x blocksize: %d bytes,
>28 leshort 2 >28 leshort 2
...@@ -446,7 +446,7 @@ ...@@ -446,7 +446,7 @@
>>40 lequad x {file-size:%lld} >>40 lequad x {file-size:%lld}
>4 lelong x %d inodes, >4 lelong x %d inodes,
>28 leshort >3 >28 leshort >3
>>12 lelong blocksize: %d bytes, >>12 lelong x blocksize: %d bytes,
>28 leshort <2 >28 leshort <2
>>32 leshort x blocksize: %d bytes, >>32 leshort x blocksize: %d bytes,
>28 leshort 2 >28 leshort 2
...@@ -481,8 +481,8 @@ ...@@ -481,8 +481,8 @@
>4 lelong x rev %d >4 lelong x rev %d
>6 leshort x \b.%d >6 leshort x \b.%d
# No journal? ext2 # No journal? ext2
>36 lelong ^0x0000004 ext2 filesystem data >36 lelong&0x04 0 ext2 filesystem data
>>2 leshort ^0x0000001 (mounted or unclean) >>2 leshort&0x01 0 (mounted or unclean)
# Has a journal? ext3 or ext4 # Has a journal? ext3 or ext4
>36 lelong &0x0000004 >36 lelong &0x0000004
# and small INCOMPAT? # and small INCOMPAT?
...@@ -519,7 +519,7 @@ ...@@ -519,7 +519,7 @@
>36 belong x %d files >36 belong x %d files
# netboot image - Juan Cespedes <cespedes@debian.org> # netboot image - Juan Cespedes <cespedes@debian.org>
0 lelong 0x1b031336L Netboot image, 0 lelong 0x1b031336 Netboot image,
>4 lelong&0xFFFFFF00 0 >4 lelong&0xFFFFFF00 0
>>4 lelong&0x100 0x000 mode 2 >>4 lelong&0x100 0x000 mode 2
>>4 lelong&0x100 0x100 mode 3 >>4 lelong&0x100 0x100 mode 3
......
src/magic/firmware
...@@ -522,7 +522,7 @@ ...@@ -522,7 +522,7 @@
# Obfuscated Arcadyan firmware # Obfuscated Arcadyan firmware
0x68 belong 0x00D50800 Obfuscated Arcadyan firmware, 0x68 belong 0x00D50800 Obfuscated Arcadyan firmware,
>0 belong x signature bytes: 0x%X, >0 belong x signature bytes: 0x%X,
>0x70 belong !\x00\x00\x00\x00\x00\x00\x00 invalid, >0x70 string !\x00\x00\x00\x00\x00\x00\x00 invalid,
>0x70 belong 0x00000000 see https://github.com/devttys0/wrt120n/deobfuscator >0x70 belong 0x00000000 see https://github.com/devttys0/wrt120n/deobfuscator
# Digi firmware images # Digi firmware images
...@@ -578,10 +578,10 @@ ...@@ -578,10 +578,10 @@
>>(198.L+206) belong x \b, file size: %d bytes >>(198.L+206) belong x \b, file size: %d bytes
>>(198.L+206) belong x \b{file-size:%d} >>(198.L+206) belong x \b{file-size:%d}
>(198.L+202) belong 3 >(198.L+202) belong 3
>>&4 string @(RECENT_FIRMWARE)/ \b, alias: >>4 string @(RECENT_FIRMWARE)/ \b, alias:
>>&23 string x "%s" >>23 string x "%s"
>>&(&0.L(0)) belong x #>>(&0.L(0)) belong x
>>>&4 belong x \b, file size: %d bytes >>>4 belong x \b, file size: %d bytes
# Signatures to identify the start of a VxWorks symbol table # Signatures to identify the start of a VxWorks symbol table
8 string \x00\x00\x05\x00\x00\x00\x00\x00 VxWorks symbol table, big endian, 8 string \x00\x00\x05\x00\x00\x00\x00\x00 VxWorks symbol table, big endian,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment