You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2020/10/05 17:51:18 UTC

svn commit: r1882254 - in /pdfbox/trunk/pdfbox/src/test: java/org/apache/pdfbox/encryption/TestPublicKeyEncryption.java resources/org/apache/pdfbox/encryption/AESkeylength128.pdf resources/org/apache/pdfbox/encryption/AESkeylength256.pdf

Author: tilman
Date: Mon Oct  5 17:51:17 2020
New Revision: 1882254

URL: http://svn.apache.org/viewvc?rev=1882254&view=rev
Log:
PDFBOX-4421: adjust test to use the files provided by Christian Appl

Added:
    pdfbox/trunk/pdfbox/src/test/resources/org/apache/pdfbox/encryption/AESkeylength128.pdf   (with props)
    pdfbox/trunk/pdfbox/src/test/resources/org/apache/pdfbox/encryption/AESkeylength256.pdf   (with props)
Modified:
    pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestPublicKeyEncryption.java

Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestPublicKeyEncryption.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestPublicKeyEncryption.java?rev=1882254&r1=1882253&r2=1882254&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestPublicKeyEncryption.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestPublicKeyEncryption.java Mon Oct  5 17:51:17 2020
@@ -19,7 +19,6 @@ package org.apache.pdfbox.encryption;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URL;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
@@ -330,8 +329,8 @@ public class TestPublicKeyEncryption
     @Test
     public void testReadPubkeyEncryptedAES128() throws IOException
     {
-        URL url = new URL("https://issues.apache.org/jira/secure/attachment/13011682/B2-Adobe-128-aes-sec.pdf");
-        try (PDDocument doc = Loader.loadPDF(url.openStream(),
+        try (InputStream is = TestPublicKeyEncryption.class.getResourceAsStream("AESkeylength128.pdf");
+             PDDocument doc = Loader.loadPDF(is,
                 "w!z%C*F-JaNdRgUk",
                 TestPublicKeyEncryption.class.getResourceAsStream("PDFBOX-4421-keystore.pfx"),
                 "testnutzer"))
@@ -340,8 +339,7 @@ public class TestPublicKeyEncryption
                     doc.getEncryption().getSecurityHandler().getClass().getSimpleName());
             Assert.assertEquals(128, doc.getEncryption().getSecurityHandler().getKeyLength());
             PDFTextStripper stripper = new PDFTextStripper();
-            //Assert.assertEquals("Key length: 128", stripper.getText(doc).trim())
-            Assert.assertTrue(stripper.getText(doc).contains("ad0000002bf"));
+            Assert.assertEquals("Key length: 128", stripper.getText(doc).trim());
         }
     }
 
@@ -354,8 +352,8 @@ public class TestPublicKeyEncryption
     @Test
     public void testReadPubkeyEncryptedAES256() throws IOException
     {
-        URL url = new URL("https://issues.apache.org/jira/secure/attachment/13011752/B2-AES-256-secured.pdf");
-        try (PDDocument doc = Loader.loadPDF(url.openStream(),
+        try (InputStream is = TestPublicKeyEncryption.class.getResourceAsStream("AESkeylength256.pdf");
+             PDDocument doc = Loader.loadPDF(is,
                 "w!z%C*F-JaNdRgUk",
                 TestPublicKeyEncryption.class.getResourceAsStream("PDFBOX-4421-keystore.pfx"),
                 "testnutzer"))
@@ -364,8 +362,7 @@ public class TestPublicKeyEncryption
                     doc.getEncryption().getSecurityHandler().getClass().getSimpleName());
             Assert.assertEquals(256, doc.getEncryption().getSecurityHandler().getKeyLength());
             PDFTextStripper stripper = new PDFTextStripper();
-            //Assert.assertEquals("Key length: 256", stripper.getText(doc).trim())
-            Assert.assertTrue(stripper.getText(doc).contains("ad0000002bf"));
+            Assert.assertEquals("Key length: 256", stripper.getText(doc).trim());
         }
     }
 }

Added: pdfbox/trunk/pdfbox/src/test/resources/org/apache/pdfbox/encryption/AESkeylength128.pdf
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/resources/org/apache/pdfbox/encryption/AESkeylength128.pdf?rev=1882254&view=auto
==============================================================================
Binary file - no diff available.

Propchange: pdfbox/trunk/pdfbox/src/test/resources/org/apache/pdfbox/encryption/AESkeylength128.pdf
------------------------------------------------------------------------------
    svn:mime-type = application/pdf

Added: pdfbox/trunk/pdfbox/src/test/resources/org/apache/pdfbox/encryption/AESkeylength256.pdf
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/resources/org/apache/pdfbox/encryption/AESkeylength256.pdf?rev=1882254&view=auto
==============================================================================
Binary file - no diff available.

Propchange: pdfbox/trunk/pdfbox/src/test/resources/org/apache/pdfbox/encryption/AESkeylength256.pdf
------------------------------------------------------------------------------
    svn:mime-type = application/pdf