TIKA-1821 Support for 1 and 3 byte length PKCS7 DER encoded magic (ne…

…eds neater way, to follow) git-svn-id: https://svn.apache.org/repos/asf/tika/trunk@1723579 13f79535-47bb-0310-9956-ffa450edef68
apache · Jan 7, 2016 · 784c0a4 · 784c0a4
1 parent 61671f5
commit 784c0a4
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml b/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
@@ -525,8 +525,12 @@
     <glob pattern="*.p7s"/>
     <magic priority="50">
       <match value="-----BEGIN PKCS7" type="string" offset="0"/>
+      <match value="0x3083FFFFFF06092a864886f70d0107FFa0" type="string"
+              mask="0xFFFF000000FFFFFFFFFFFFFFFFFFFF00FF" offset="0"/>
       <match value="0x3082FFFF06092a864886f70d0107FFa0" type="string"
               mask="0xFFFF0000FFFFFFFFFFFFFFFFFFFF00FF" offset="0"/>
+      <match value="0x3081FF06092a864886f70d0107FFa0" type="string"
+              mask="0xFFFF00FFFFFFFFFFFFFFFFFFFF00FF" offset="0"/>
       <match value="0x308006092a864886f70d0107FFa0" type="string"
               mask="0xFFFFFFFFFFFFFFFFFFFFFFFF00FF" offset="0"/>
     </magic>