Fixed errors in signatures

src/binwalk/magic/console

@@ -78,10 +78,12 @@
 ## Microsoft Xbox executables .xbe (Esa Hyytiä <ehyytia@cc.hut.fi>)
 0                       string              XBEH            Microsoft Xbox executable (XBE),
 ## probabilistic checks whether signed or not
->0x0004                 ulelong             =0x0
->>2                     ulelong             =0x0            \b, not signed
+>0x0004                 ulelong             =0
+>>10                    ulelong             =0
+>>>16                   ulelong             =0              \b, not signed
 >0x0004                 ulelong             >0
->>2                     ulelong             >0              \b, signed
+>>10                    ulelong             >0              \b, signed
+>>>16                   ulelong             >0              \b, signed
 ## expect base address of 0x10000
 >0x0104                 ulelong             !0x10000        {invalid}
 >0x0104                 ulelong             =0x10000

src/binwalk/magic/crypto

@@ -41,13 +41,13 @@
 #------------------------------------------------------------------------------
 # Mavroyanopoulos Nikos <nmav@hellug.gr>
 # mcrypt:   file(1) magic for mcrypt 2.2.x;
-#0    string        \0m\3        mcrypt 2.5 encrypted data,
-#>4    byte        0        {invalid}
-#>4    string        >\0        algorithm: "%s",
-#>>&1    leshort        <1        {invalid}
-#>>&1    leshort        >0        keysize: %d bytes,
-#>>>&0    byte        0        {invalid}
-#>>>&0    string        >\0        mode: "%s",
+0       string      \0m\3       mcrypt 2.5 encrypted data,
+>4      byte        0           {invalid}
+>4      string      x           algorithm: "%s",
+>>&1    leshort     <1          {invalid}
+>>&1    leshort     >0          keysize: %d bytes,
+>>>&0   byte        0           {invalid}
+>>>&0   string      >\0         mode: "%s",
 
 0       string      \0m\2       mcrypt 2.2 encrypted data,
 >3      byte        0           algorithm: blowfish-448,

src/binwalk/magic/firmware

@@ -529,7 +529,7 @@
 >>>>>>0xC8      beshort !0x4f53
 >>>>>>>0xC8     beshort !0x4f43
 >>>>>>>>0xC8    beshort !0x4646
->>>>>>>>>0xC8   beshort !0x5350         {invalid} header,
+>>>>>>>>>0xC8   beshort !0x5350         {invalid}invalid header,
 >0xD4           belong  x               load address: 0x%.8X,
 >0xDC           belong  x               entry point: 0x%.8X,
 
@@ -543,7 +543,7 @@
 >12  ubyte             >0
 >>12 ubyte             <220              RC%d,
 >12  ubyte             >220
->>12 ubyte             <237              RU{math:%d-220},
+>>12 ubyte-220         <237              RU%d,
 >12  ubyte             0                 dev
 >17  ubyte             >0
 >>17 ubyte             x                 build %d
@@ -565,17 +565,20 @@
 >>7  string            x                 \b, "%s"
 
 0               string      ELSP                    LANCOM file entry
+>(198.L+202)    belong      !2
+>>(198.L+202)   belong      !3                      {invalid}
 >202            string      @(RECENT_FIRMWARE)/     \b, file name:
 >>221           string      x                       "%s"
->>221 string           x                   \b{file-name:%s}
+>>221           string      x                       \b{name:%s}
 >(198.L+202)    belong      2
+>>(198.L+206)   belong      <1                      {invalid}
 >>(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{size:%d}
 >(198.L+202)    belong      3
->>4 string             @(RECENT_FIRMWARE)/ \b, alias:
->>23 string            x                   "%s"
+>>&4            string      @(RECENT_FIRMWARE)/     \b, alias:
+>>&23           string      x                       "%s"
 #>>(&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
 8       string      \x00\x00\x05\x00\x00\x00\x00\x00    VxWorks symbol table, big endian,