Improved signature validation

src/binwalk/magic/archives

@@ -179,6 +179,8 @@
 # RPM: file(1) magic for Red Hat Packages   Erik Troan (ewt@redhat.com)
 #
 0     ubelong       0xedabeedb   RPM
+>4    byte          <1           {invalid}
+>4    byte          >99          {invalid}
 >4    byte          x            v%d
 >6    beshort       0            bin
 >6    beshort       1            src

src/binwalk/magic/binwalk

-# This is just here to make sure that the older "binwalk" file in this directory
-# is overwritten during an installation of the newer binwalk code.

src/binwalk/magic/crypto

@@ -21,10 +21,12 @@
 # From: Gert Hulselmans <hulselmansgert@gmail.com>
 0       string          \x30\x82        Private key in DER format (PKCS#8),
 >4      string          !\x02\x01\x00   {invalid}
+>2      beshort         <0              {invalid}
 >2      beshort         x               header length: 4, sequence length: %d
 
 0       string          \x30\x82        Certificate in DER format (x509 v3),
 >4      string          !\x30\x82       {invalid}
+>2      beshort         <0              {invalid}
 >2      beshort         x               header length: 4, sequence length: %d
 
 # GnuPG

src/binwalk/magic/filesystems

@@ -62,6 +62,7 @@
 
 # PFS file system
 0       string    PFS/      PFS filesystem,
+>5      byte      !0x2E     {invalid}
 >4      string    x         version %s,
 >14     leshort   x         %d files