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 2020/09/29 16:07:39 UTC

[tika] 05/05: Make the DER private key mostly-match a bit more specific

This is an automated email from the ASF dual-hosted git repository.

nick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git

commit 618345263ee41108e1a225dbcdbb8db16b2aae28
Author: Nick Burch <ni...@gagravarr.org>
AuthorDate: Tue Sep 29 16:51:19 2020 +0100

    Make the DER private key mostly-match a bit more specific
---
 .../main/resources/org/apache/tika/mime/tika-mimetypes.xml    | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 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
index abcc5d5..92cbb21 100644
--- 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
@@ -4676,12 +4676,13 @@
   <mime-type type="application/x-x509-key;format=der">
     <sub-class-of type="application/x-x509-key"/>
     <!-- These are just a bunch of magic integers as defined by the key format... -->
-    <!-- Always seem to have an integer=01 as their first entry, check for that -->
+    <!-- Always seem to have a version integer as their first entry, -->
+    <!--  normally 00, 01 or 02, check for that -->
     <magic priority="40">
-      <match value="0x3081FF0201" type="string"
-              mask="0xFFFF00FFFF" offset="0"/>
-      <match value="0x3082FFFF0201" type="string"
-              mask="0xFFFF0000FFFF" offset="0"/>
+      <match value="0x3081FF020100" type="string"
+              mask="0xFFFF00FFFFFC" offset="0"/>
+      <match value="0x3082FFFF020100" type="string"
+              mask="0xFFFF0000FFFFFC" offset="0"/>
     </magic>
   </mime-type>