You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ni...@apache.org on 2016/01/07 16:42:40 UTC

svn commit: r1723579 - /tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml

Author: nick
Date: Thu Jan  7 15:42:40 2016
New Revision: 1723579

URL: http://svn.apache.org/viewvc?rev=1723579&view=rev
Log:
TIKA-1821 Support for 1 and 3 byte length PKCS7 DER encoded magic (needs neater way, to follow)

Modified:
    tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml

Modified: tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml?rev=1723579&r1=1723578&r2=1723579&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml (original)
+++ tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml Thu Jan  7 15:42:40 2016
@@ -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>