You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2024/02/12 17:54:21 UTC

(tika) branch branch_2x updated: [TIKA-4194] Fix for unrecognized pkcs12 keystores (#1589)

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

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


The following commit(s) were added to refs/heads/branch_2x by this push:
     new 62fd50050 [TIKA-4194] Fix for unrecognized pkcs12 keystores (#1589)
62fd50050 is described below

commit 62fd50050e7b06cceae68a7e7241919a5cd1d7f8
Author: Lonzak <tv...@nepatec.de>
AuthorDate: Mon Feb 12 18:52:54 2024 +0100

    [TIKA-4194] Fix for unrecognized pkcs12 keystores (#1589)
    
    (cherry picked from commit c2acd713bb31b88419ebc70dd31c4bfb23bd390f)
---
 tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml | 2 ++
 1 file changed, 2 insertions(+)

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 b76adebd1..7a6d660e5 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
@@ -5147,6 +5147,8 @@
     <!-- Always seem to have a version integer as their first entry, -->
     <!--  normally 00, 01 or 02, check for that -->
     <magic priority="40">
+      <match value="0x3080020100" type="string"
+              mask="0xFFFFFFFFFC" offset="0"/>
       <match value="0x3081FF020100" type="string"
               mask="0xFFFF00FFFFFC" offset="0"/>
       <match value="0x3082FFFF020100" type="string"