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 2022/06/05 14:49:17 UTC
[tika] branch main updated (5e3dab7ae -> 6bf9ee120)
This is an automated email from the ASF dual-hosted git repository.
nick pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
from 5e3dab7ae TIKA-3751: update aws
new 8ef8d636f Crypto test files - Encrypted version of testRSAKEY.pem, and a PKCS12 wrapped version
new 6bf9ee120 Tests for encrypted RSA keys in PEM and DER, plus a disabled PKCS12 test pending TIKA-3784
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../test/java/org/apache/tika/mime/TestMimeTypes.java | 7 +++++++
.../resources/test-documents/testRSAKEYandCERT.p12 | Bin 0 -> 1717 bytes
.../test/resources/test-documents/testRSAKEYenc.der} | Bin
.../test/resources/test-documents/testRSAKEYenc.pem | 18 ++++++++++++++++++
4 files changed, 25 insertions(+)
create mode 100644 tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/test-documents/testRSAKEYandCERT.p12
copy tika-parsers/tika-parsers-standard/{tika-parsers-standard-modules/tika-parser-crypto-module/src/test/resources/test-documents/testRSAKEY.der => tika-parsers-standard-package/src/test/resources/test-documents/testRSAKEYenc.der} (100%)
create mode 100644 tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/test-documents/testRSAKEYenc.pem
[tika] 01/02: Crypto test files - Encrypted version of testRSAKEY.pem, and a PKCS12 wrapped version
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nick pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 8ef8d636f87dd571a8dc844d1d7ac503522b13ed
Author: Nick Burch <ni...@gagravarr.org>
AuthorDate: Sun Jun 5 15:34:54 2022 +0100
Crypto test files - Encrypted version of testRSAKEY.pem, and a PKCS12 wrapped version
---
.../resources/test-documents/testRSAKEYandCERT.p12 | Bin 0 -> 1717 bytes
.../test/resources/test-documents/testRSAKEYenc.der | Bin 0 -> 610 bytes
.../test/resources/test-documents/testRSAKEYenc.pem | 18 ++++++++++++++++++
3 files changed, 18 insertions(+)
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/test-documents/testRSAKEYandCERT.p12 b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/test-documents/testRSAKEYandCERT.p12
new file mode 100644
index 000000000..1c536e8fb
Binary files /dev/null and b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/test-documents/testRSAKEYandCERT.p12 differ
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/test-documents/testRSAKEYenc.der b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/test-documents/testRSAKEYenc.der
new file mode 100644
index 000000000..22c4f86d4
Binary files /dev/null and b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/test-documents/testRSAKEYenc.der differ
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/test-documents/testRSAKEYenc.pem b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/test-documents/testRSAKEYenc.pem
new file mode 100644
index 000000000..5d8f9057e
--- /dev/null
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/test-documents/testRSAKEYenc.pem
@@ -0,0 +1,18 @@
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: DES-EDE3-CBC,9CF7E869357B3BD6
+
+37j1uZrDJ6VIz2VPWJJObW0TtXvU1zCpNo0w/xO6y6Lanq7OutBtQ5+SBSXFRjxa
+v2YsZ9OAw0PkeMRnw2CUN5bn2L5gvSgtzIV14slNDf20FAjemHpPAxFqNg6yFdZx
+O7xbkKK9KgbFAc4lnBEVPEzfLmUZEI0d/vTnYzciyInUcfq2rkCrAmDq0e642whR
+276/ayCNSEXMDpE7N3d7CT43Df5Fk7YsPYvvvyVInV56MSoESmMA093PeMiHcXwG
+VKQCvJpdzxookQpwIYBqGnjahIOhWCRvm9ji17GN+tjaU3kqUzCoKldxSFS/9mAz
+tiF4dDJk2BVF5yMQ7jplnVOW0dYv7wT5yPlbv6vOWeIL1igrM6YjK8hbC87s6kDD
+DwnpPKYBP3MX8lvXJb/cMdeSDuWgjT9jhlDklmq00FzHJBwI+1neTfzSmsI++qi5
+sah3TCXmv/3uuZrTXwq73pjyi4W0VxdH0FPgyspeayn6dP2j3WrRgWQVdwLSEIqi
+wl2kCIyxsHr5LUqwVJn0zSGXQ+Zs/gkoFrz7sriGe9yecLGHzv+8UVCksVWWadDg
+RuknU0EUwuK2nkGg+mazfcxHf6RzqOMwT3oZDvNysE2vwDyC1ExxpFlZPSRP0Uwv
+rCe2aVMzEj2zPLLkPR2dyUyTHgyfWuI/0MYO1Dg/0LvSg1cwyN5cAyHlN6D9aP4B
+SjU+WgSq5VJGBCZcPnYLyz8n4z9cRPsaO6/11p99HytmNh2EOwROv/VlCh5VKW1q
+SSjRrI754tUvyf+pbTtEOI2yvUbmIcql/wskwE/BbPWtQxEPb/v3QQ==
+-----END RSA PRIVATE KEY-----
[tika] 02/02: Tests for encrypted RSA keys in PEM and DER, plus a disabled PKCS12 test pending TIKA-3784
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nick pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 6bf9ee120c2845ccdf61207322dcea2373388e75
Author: Nick Burch <ni...@gagravarr.org>
AuthorDate: Sun Jun 5 15:48:36 2022 +0100
Tests for encrypted RSA keys in PEM and DER, plus a disabled PKCS12 test pending TIKA-3784
---
.../src/test/java/org/apache/tika/mime/TestMimeTypes.java | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/mime/TestMimeTypes.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/mime/TestMimeTypes.java
index a90d27272..2a2936bae 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/mime/TestMimeTypes.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/mime/TestMimeTypes.java
@@ -1163,6 +1163,7 @@ public class TestMimeTypes {
@Test
public void testCertificatesKeys() throws Exception {
+ // Certificates can be identified by name alone, or with data
assertType("application/x-x509-cert; format=pem", "testCERT.pem");
assertType("application/x-x509-cert; format=der", "testCERT.der");
assertTypeByData("application/x-x509-cert; format=pem", "testCERT.pem");
@@ -1174,9 +1175,15 @@ public class TestMimeTypes {
assertTypeByData("application/x-x509-key; format=der", "testRSAKEY.der");
assertTypeByData("application/x-x509-key; format=pem", "testDSAKEY.pem");
assertTypeByData("application/x-x509-key; format=der", "testDSAKEY.der");
+ assertTypeByData("application/x-x509-key; format=pem", "testRSAKEYenc.pem"); // pass=tika
+ assertTypeByData("application/x-x509-key; format=der", "testRSAKEYenc.der"); // pass=tika
// Parameters only have PEM form, always need data
assertTypeByData("application/x-x509-dsa-parameters", "testDSAPARAMS.pem");
assertTypeByData("application/x-x509-ec-parameters", "testECPARAMS.pem");
+ // PKCS12 wrappers of Certs+Keys cannot currently be identified
+ // Once solved, see TIKA-3784, ought to work for name or data
+ //assertType("application/x-pkcs12", "testRSAKEYandCERT.p12");
+ //assertTypeByData("application/x-pkcs12", "testRSAKEYandCERT.p12"); // pass=tika
}
@Test