Author: nick
Date: Thu Jan 7 15:53:47 2016
New Revision: 1723581
URL: http://svn.apache.org/viewvc?rev=1723581&view=rev
Log:
Try to make the common parts clearer for the DER-encoded PKCS7 signature
(length comes between 0x308. and the pkcs7 object)
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=1723581&r1=1723580&r2=1723581&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:53:47 2016
@@ -524,15 +524,29 @@
<mime-type type="application/pkcs7-signature">
<glob pattern="*.p7s"/>
<magic priority="50">
+ <!-- PEM encoded -->
<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"/>
+ <!-- DER encoded, sequence+length, object=pkcs7-signedData -->
+ <match value="0x3080" offset="0">
+ <match value="0x06092a864886f70d0107FFa0" type="string"
+ mask="0xFFFFFFFFFFFFFFFFFFFF00FF" offset="2"/>
+ </match>
+ <match value="0x3081" offset="0">
+ <match value="0x06092a864886f70d0107FFa0" type="string"
+ mask="0xFFFFFFFFFFFFFFFFFFFF00FF" offset="3"/>
+ </match>
+ <match value="0x3082" offset="0">
+ <match value="0x06092a864886f70d0107FFa0" type="string"
+ mask="0xFFFFFFFFFFFFFFFFFFFF00FF" offset="4"/>
+ </match>
+ <match value="0x3083" offset="0">
+ <match value="0x06092a864886f70d0107FFa0" type="string"
+ mask="0xFFFFFFFFFFFFFFFFFFFF00FF" offset="5"/>
+ </match>
+ <match value="0x3084" offset="0">
+ <match value="0x06092a864886f70d0107FFa0" type="string"
+ mask="0xFFFFFFFFFFFFFFFFFFFF00FF" offset="6"/>
+ </match>
</magic>
</mime-type>
