[tika] 02/02: Tests for encrypted RSA keys in PEM and DER, plus a disabled PKCS12 test pending TIKA-3784

[nick]

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 <n...@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