Merge branch 'master' of https://github.com/devttys0/binwalk

src/binwalk/magic/efi

+# http://blogs.phoenix.com/phoenix_technologies_bios/\
+# 2007/02/uefi_pi_10_firm.html
+
+40      string     _FVH              UEFI PI Firmware Volume
+>32     ulequad    >0xFFFFFFFF       {invalid} unrealistic size
+>32     ulequad    x                 \b, volume size: %d
+>52     uleshort   x                 \b, header size: %d
+>58     ubyte      !0                {invalid} reserved byte set
+>59     ubyte      >1                {invalid} invalid revision
+>59     ubyte      x                 \b, revision: %d
+
+# GUID: 7A9354D9-0468-444A-81CE-0BF617D890D
+>16     string     \xd9\x54\x93\x7a\x68\x04\x4a\x44\x81\xce\x0b\xf6\x17\xd8\x90\xdf  \b, EFI Firmware File System
+
+# GUID: 8C8CE578-8A3D-4F1C-9935-896185C32DD3
+>16     string     \x78\xe5\x8c\x8c\x3d\x8a\x1c\x4f\x99\x35\x89\x61\x85\xc3\x2d\xd3  \b, EFI Firmware File System v2
+
+# GUID: 04ADEEAD-61FF-4D31-B6BA-64F8BF901F5A
+>16     string     \xad\xee\xad\x04\xff\x61\x31\x4d\xb6\xba\x64\xf8\xbf\x90\x1f\x5a  \b, Apple Boot Volume
+
+# GUID: 8C1B00BD-716A-7B48-A14F-0C2A2DCF7A5D
+>16     string     \x8c\x1b\x00\xbd\x71\x6a\x7b\x48\xa1\x4f\x0c\x2a\x2d\xcf\x7a\x5d  \b, Apple Boot Volume v2
+
+# GUID: AD3FFFFF-D28B-44C4-9F13-9EA98A97F9F0
+>16     string     \xff\xff\x3f\xad\x8b\xd2\xc4\x44\x9f\x13\x9e\xa9\x8a\x97\xf9\xf0  \b, Intel v1
+
+# GUID: D6A1CD70-4B33-4994-A6EA-375F2CCC5437
+>16     string     \x70\xcd\xa1\xd6\x33\x4b\x94\x49\xa6\xea\x37\x5f\x2c\xcc\x54\x37  \b, Intel v2
+
+# GUID: 4F494156-AED6-4D64-A537-B8A5557BCEEC
+>16     string     \x56\x41\x49\x4f\xd6\xae\x64\x4d\xa5\x37\xb8\xa5\x55\x7b\xce\xec  \b, Sony v1
+
+# GUID: FFF12B8D-7696-4C8B-85A9-2747075B4F50
+>16     string     \x8d\x2b\xf1\xff\x96\x76\x8b\x4c\xa9\x85\x27\x47\x07\x5b\x4f\x50  \b, Variable Storage
+
+>16     ulelong    x                 \b, GUID: %.8X-
+>>20    uleshort   x                 \b%.4X-
+>>22    uleshort   x                 \b%.4X-
+>>24    uleshort   x                 \b%.4X-
+>>26    ubyte      x                 \b%.2X
+>>27    ubyte      x                 \b%.2X
+>>28    ubyte      x                 \b%.2X
+>>29    ubyte      x                 \b%.2X
+>>30    ubyte      x                 \b%.2X
+>>31    ubyte      x                 \b%.2X
+
+# http://www.intel.com/content/www/us/en/architecture-and-technology/\
+# unified-extensible-firmware-interface/efi-capsule-specification.html
+# GUID: 3B6686BD-0D76-4030-B70E-B5519E2FC5A0
+0       string     \xBD\x86\x66\x3B\x76\x0D\x30\x40\xB7\x0E\xB5\x51\x9E\x2F\xC5\xA0  EFI capsule v0.9
+>16     lelong     <0                {invalid}
+>16     lelong     x                 \b, header size: %d
+>20     lelong     x                 \b, flags: 0x%.8X
+>24     lelong     <0                {invalid}
+>24     lelong     x                 \b, capsule size: %d
+
+# Intel/UEFI format
+# http://www.uefi.org/sites/default/files/resources/UEFI%202_5.pdf
+# GUID: 539182B9-ABB5-4391-B69A-E3A943F72FCC
+0       string     \xb9\x82\x91\x53\xb5\xab\x91\x43\xb6\x9a\xe3\xa9\x43\xf7\x2f\xcc  UEFI capsule
+>16     lelong     <0                {invalid}
+>16     lelong     x                 \b, header size: %d
+>20     lelong     x                 \b, flags: 0x%.8X
+>24     lelong     <0                {invalid}
+>24     lelong     x                 \b, capsule size: %d
+
+# GUID: 4A3CA68B-7723-48FB-803D-578CC1FEC44D
+0       string     \x8b\xa6\x3c\x4a\x23\x77\xfb\x48\x80\x3d\x57\x8c\xc1\xfe\xc4\x4d  AMI Aptio extended EFI capsule
+>16     lelong     <0                {invalid}
+>16     lelong     x                 \b, header size: %d
+>20     lelong     x                 \b, flags: 0x%.8X
+>24     lelong     <0                {invalid}
+>24     lelong     x                 \b, capsule size: %d
+
+# GUID: 14EEBB90-890A-43DB-AED1-5D3C4588A418
+0       string     \x90\xbb\xee\x14\x0a\x89\xdb\x43\xae\xd1\x5d\x3c\x45\x88\xa4\x18  AMI Aptio unsigned EFI capsule
+>16     lelong     <0                {invalid}
+>16     lelong     x                 \b, header size: %d
+>20     lelong     x                 \b, flags: 0x%.8X
+>24     lelong     <0                {invalid}
+>24     lelong     x                 \b, capsule size: %d
+
+# GUID: 3BE07062-1D51-45D2-2B83-F093257ED461
+0       string     \x62\x70\xe0\x3b\x51\x1d\xd2\x45\x83\x2b\xf0\x93\x25\x7e\xd4\x61  Toshiba EFI capsule
+>16     lelong     <0                {invalid}
+>16     lelong     x                 \b, header size: %d
+>20     lelong     x                 \b, flags: 0x%.8X
+>24     lelong     <0                {invalid}
+>24     lelong     x                 \b, capsule size: %d

src/binwalk/magic/firmware

@@ -495,8 +495,6 @@
 >35     byte        x           try decryption tool from:
 >35     byte        x           http://download.modem-help.co.uk/mfcs-A/Alcatel/Modems/Misc/
 
-16    string        \xd9\x54\x93\x7a\x68\x04\x4a\x44\x81\xce\x0b\xf6\x17\xd8\x90\xdf    UEFI PI firmware volume
-
 # http://android.stackexchange.com/questions/23357/\
 # is-there-a-way-to-look-inside-and-modify-an-adb-backup-created-file/\
 # 23608#23608