You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ja...@apache.org on 2014/03/12 06:50:45 UTC
svn commit: r1576587 [1/2] - in /pdfbox/trunk:
examples/src/main/java/org/apache/pdfbox/examples/fdf/
examples/src/main/java/org/apache/pdfbox/examples/lucene/
examples/src/main/java/org/apache/pdfbox/examples/pdmodel/
examples/src/main/java/org/apache...
Author: jahewson
Date: Wed Mar 12 05:50:43 2014
New Revision: 1576587
URL: http://svn.apache.org/r1576587
Log:
PDFBOX-1973: Replace CryptographyException with IOException
Removed:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/exceptions/CryptographyException.java
Modified:
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/fdf/PrintFields.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/fdf/SetField.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/lucene/LucenePDFDocument.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/AddImageToPDF.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/AddMessageToEachPage.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/CreateBlankPDF.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/CreateLandscapePDF.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/EmbeddedFiles.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractEmbeddedFiles.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractMetadata.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/HelloWorld.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/HelloWorldTTF.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/HelloWorldType1AfmPfb.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ImageToPDF.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/RubberStampWithImage.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ShowColorBoxes.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/UsingTextMatrix.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/persistence/CopyDoc.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateSignature.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateVisibleSignature.java
pdfbox/trunk/examples/src/test/java/org/apache/pdfbox/examples/pdmodel/TestRubberStampWithImage.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSArray.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSBase.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDocument.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObject.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSStream.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSString.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/ICOSVisitor.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encryption/DocumentEncryption.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encryption/PDFEncryption.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/NonSequentialPDFParser.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocument.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/COSStreamArray.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/StandardSecurityHandler.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFDocument.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDFTemplateCreator.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDFTemplateStructure.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDVisibleSigProperties.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMergerUtility.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFTextStripper.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/cos/TestCOSBase.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/cos/TestCOSString.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestPublicKeyEncryption.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocument.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestLayerUtility.java
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/OverlayPDF.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFDebugger.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFReader.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFSplit.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFToImage.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/WriteDecodedDoc.java
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/fdf/PrintFields.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/fdf/PrintFields.java?rev=1576587&r1=1576586&r2=1576587&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/fdf/PrintFields.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/fdf/PrintFields.java Wed Mar 12 05:50:43 2014
@@ -20,7 +20,6 @@ import java.io.IOException;
import java.util.Iterator;
import java.util.List;
-import org.apache.pdfbox.exceptions.CryptographyException;
import org.apache.pdfbox.exceptions.InvalidPasswordException;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
@@ -108,9 +107,8 @@ public class PrintFields
* @param args command line arguments
*
* @throws IOException If there is an error importing the FDF document.
- * @throws CryptographyException If there is an error decrypting the document.
*/
- public static void main(String[] args) throws IOException, CryptographyException
+ public static void main(String[] args) throws IOException
{
PDDocument pdf = null;
try
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/fdf/SetField.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/fdf/SetField.java?rev=1576587&r1=1576586&r2=1576587&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/fdf/SetField.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/fdf/SetField.java Wed Mar 12 05:50:43 2014
@@ -17,9 +17,7 @@
package org.apache.pdfbox.examples.fdf;
import java.io.IOException;
-import java.security.NoSuchAlgorithmException;
-import org.apache.pdfbox.exceptions.CryptographyException;
import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
@@ -69,14 +67,14 @@ public class SetField
* @throws IOException If there is an error importing the FDF document.
*/
public static void main(String[] args)
- throws IOException, CryptographyException, SignatureException
+ throws IOException, SignatureException
{
SetField setter = new SetField();
setter.setField(args);
}
private void setField(String[] args)
- throws IOException, CryptographyException, SignatureException
+ throws IOException, SignatureException
{
PDDocument pdf = null;
try
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/lucene/LucenePDFDocument.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/lucene/LucenePDFDocument.java?rev=1576587&r1=1576586&r2=1576587&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/lucene/LucenePDFDocument.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/lucene/LucenePDFDocument.java Wed Mar 12 05:50:43 2014
@@ -34,7 +34,6 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
-import org.apache.pdfbox.exceptions.CryptographyException;
import org.apache.pdfbox.exceptions.InvalidPasswordException;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDDocumentInformation;
@@ -503,10 +502,6 @@ public class LucenePDFDocument
// with hit documents for display.
addUnindexedField(document, "summary", summary);
}
- catch (CryptographyException e)
- {
- throw new IOException("Error decrypting document(" + documentLocation + "): " + e);
- }
catch (InvalidPasswordException e)
{
// they didn't suppply a password and the default of "" was wrong.
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/AddImageToPDF.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/AddImageToPDF.java?rev=1576587&r1=1576586&r2=1576587&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/AddImageToPDF.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/AddImageToPDF.java Wed Mar 12 05:50:43 2014
@@ -20,7 +20,6 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
-import org.apache.pdfbox.exceptions.CryptographyException;
import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.io.RandomAccessFile;
@@ -53,7 +52,7 @@ public class AddImageToPDF
* @throws IOException If there is an error writing the data.
*/
public void createPDFFromImage( String inputFile, String image, String outputFile )
- throws IOException, CryptographyException, SignatureException
+ throws IOException, SignatureException
{
// the document
PDDocument doc = null;
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/AddMessageToEachPage.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/AddMessageToEachPage.java?rev=1576587&r1=1576586&r2=1576587&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/AddMessageToEachPage.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/AddMessageToEachPage.java Wed Mar 12 05:50:43 2014
@@ -19,7 +19,6 @@ package org.apache.pdfbox.examples.pdmod
import java.io.IOException;
import java.util.List;
-import org.apache.pdfbox.exceptions.CryptographyException;
import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
@@ -57,7 +56,7 @@ public class AddMessageToEachPage
* @throws IOException If there is an error writing the data.
*/
public void doIt( String file, String message, String outfile )
- throws IOException, CryptographyException, SignatureException
+ throws IOException, SignatureException
{
// the document
PDDocument doc = null;
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/CreateBlankPDF.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/CreateBlankPDF.java?rev=1576587&r1=1576586&r2=1576587&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/CreateBlankPDF.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/CreateBlankPDF.java Wed Mar 12 05:50:43 2014
@@ -18,7 +18,6 @@ package org.apache.pdfbox.examples.pdmod
import java.io.IOException;
-import org.apache.pdfbox.exceptions.CryptographyException;
import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
@@ -42,7 +41,7 @@ public class CreateBlankPDF
* @throws IOException If there is an error writing the data.
*/
public void create( String file )
- throws IOException, CryptographyException, SignatureException
+ throws IOException, SignatureException
{
PDDocument document = null;
try
@@ -71,7 +70,7 @@ public class CreateBlankPDF
* @throws IOException If there is an error writing the document data.
*/
public static void main( String[] args )
- throws IOException, CryptographyException, SignatureException
+ throws IOException, SignatureException
{
if( args.length != 1 )
{
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/CreateLandscapePDF.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/CreateLandscapePDF.java?rev=1576587&r1=1576586&r2=1576587&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/CreateLandscapePDF.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/CreateLandscapePDF.java Wed Mar 12 05:50:43 2014
@@ -18,7 +18,6 @@ package org.apache.pdfbox.examples.pdmod
import java.io.IOException;
-import org.apache.pdfbox.exceptions.CryptographyException;
import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
@@ -50,7 +49,7 @@ public class CreateLandscapePDF
* @throws IOException If there is an error writing the data.
*/
public void doIt( String message, String outfile )
- throws IOException, CryptographyException, SignatureException
+ throws IOException, SignatureException
{
// the document
PDDocument doc = null;
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/EmbeddedFiles.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/EmbeddedFiles.java?rev=1576587&r1=1576586&r2=1576587&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/EmbeddedFiles.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/EmbeddedFiles.java Wed Mar 12 05:50:43 2014
@@ -23,7 +23,6 @@ import java.util.Collections;
import java.util.GregorianCalendar;
import java.util.List;
-import org.apache.pdfbox.exceptions.CryptographyException;
import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDDocumentNameDictionary;
@@ -60,8 +59,7 @@ public class EmbeddedFiles
*
* @throws IOException If there is an error writing the data.
*/
- public void doIt( String file)
- throws IOException, CryptographyException, SignatureException
+ public void doIt( String file) throws IOException, SignatureException
{
// the document
PDDocument doc = null;
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractEmbeddedFiles.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractEmbeddedFiles.java?rev=1576587&r1=1576586&r2=1576587&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractEmbeddedFiles.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractEmbeddedFiles.java Wed Mar 12 05:50:43 2014
@@ -76,10 +76,6 @@ public class ExtractEmbeddedFiles
{
System.err.println( "Error: The document is encrypted." );
}
- catch( org.apache.pdfbox.exceptions.CryptographyException e )
- {
- e.printStackTrace();
- }
}
PDDocumentNameDictionary namesDictionary =
new PDDocumentNameDictionary( document.getDocumentCatalog() );
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractMetadata.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractMetadata.java?rev=1576587&r1=1576586&r2=1576587&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractMetadata.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractMetadata.java Wed Mar 12 05:50:43 2014
@@ -77,10 +77,6 @@ public class ExtractMetadata
{
System.err.println( "Error: The document is encrypted." );
}
- catch( org.apache.pdfbox.exceptions.CryptographyException e )
- {
- e.printStackTrace();
- }
}
PDDocumentCatalog catalog = document.getDocumentCatalog();
PDMetadata meta = catalog.getMetadata();
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/HelloWorld.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/HelloWorld.java?rev=1576587&r1=1576586&r2=1576587&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/HelloWorld.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/HelloWorld.java Wed Mar 12 05:50:43 2014
@@ -18,7 +18,6 @@ package org.apache.pdfbox.examples.pdmod
import java.io.IOException;
-import org.apache.pdfbox.exceptions.CryptographyException;
import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
@@ -54,8 +53,7 @@ public class HelloWorld
*
* @throws IOException If there is an error writing the data.
*/
- public void doIt( String file, String message)
- throws IOException, CryptographyException, SignatureException
+ public void doIt( String file, String message) throws IOException, SignatureException
{
// the document
PDDocument doc = null;
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/HelloWorldTTF.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/HelloWorldTTF.java?rev=1576587&r1=1576586&r2=1576587&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/HelloWorldTTF.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/HelloWorldTTF.java Wed Mar 12 05:50:43 2014
@@ -19,7 +19,6 @@ package org.apache.pdfbox.examples.pdmod
import java.io.IOException;
-import org.apache.pdfbox.exceptions.CryptographyException;
import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
@@ -46,7 +45,7 @@ public class HelloWorldTTF
* @throws IOException If there is an error writing the data.
*/
public void doIt(final String file, final String message, final String fontfile)
- throws IOException, CryptographyException, SignatureException
+ throws IOException, SignatureException
{
// the document
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/HelloWorldType1AfmPfb.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/HelloWorldType1AfmPfb.java?rev=1576587&r1=1576586&r2=1576587&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/HelloWorldType1AfmPfb.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/HelloWorldType1AfmPfb.java Wed Mar 12 05:50:43 2014
@@ -19,7 +19,6 @@ package org.apache.pdfbox.examples.pdmod
import java.io.IOException;
-import org.apache.pdfbox.exceptions.CryptographyException;
import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
@@ -47,7 +46,7 @@ public class HelloWorldType1AfmPfb
* @throws IOException If there is an error writing the data.
*/
public void doIt(String file, String message, String fontfile)
- throws IOException, CryptographyException, SignatureException
+ throws IOException, SignatureException
{
// the document
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ImageToPDF.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ImageToPDF.java?rev=1576587&r1=1576586&r2=1576587&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ImageToPDF.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ImageToPDF.java Wed Mar 12 05:50:43 2014
@@ -20,7 +20,6 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
-import org.apache.pdfbox.exceptions.CryptographyException;
import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.io.RandomAccessFile;
@@ -52,7 +51,7 @@ public class ImageToPDF
* @throws IOException If there is an error writing the data.
*/
public void createPDFFromImage( String file, String image)
- throws IOException, CryptographyException, SignatureException
+ throws IOException, SignatureException
{
// the document
PDDocument doc = null;
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/RubberStampWithImage.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/RubberStampWithImage.java?rev=1576587&r1=1576586&r2=1576587&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/RubberStampWithImage.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/RubberStampWithImage.java Wed Mar 12 05:50:43 2014
@@ -17,7 +17,6 @@
package org.apache.pdfbox.examples.pdmodel;
import org.apache.pdfbox.cos.COSDictionary;
-import org.apache.pdfbox.exceptions.CryptographyException;
import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
@@ -58,7 +57,7 @@ public class RubberStampWithImage
* @throws IOException an exception is thrown if something went wrong
*/
public void doIt( String[] args )
- throws IOException, CryptographyException, SignatureException
+ throws IOException, SignatureException
{
if( args.length != 3 )
{
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ShowColorBoxes.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ShowColorBoxes.java?rev=1576587&r1=1576586&r2=1576587&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ShowColorBoxes.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ShowColorBoxes.java Wed Mar 12 05:50:43 2014
@@ -19,7 +19,6 @@ package org.apache.pdfbox.examples.pdmod
import java.awt.Color;
import java.io.IOException;
-import org.apache.pdfbox.exceptions.CryptographyException;
import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
@@ -52,7 +51,7 @@ public class ShowColorBoxes
* @throws IOException If there is an error writing the data.
*/
public void doIt( String file)
- throws IOException, CryptographyException, SignatureException
+ throws IOException, SignatureException
{
// the document
PDDocument doc = null;
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/UsingTextMatrix.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/UsingTextMatrix.java?rev=1576587&r1=1576586&r2=1576587&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/UsingTextMatrix.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/UsingTextMatrix.java Wed Mar 12 05:50:43 2014
@@ -18,7 +18,6 @@ package org.apache.pdfbox.examples.pdmod
import java.io.IOException;
-import org.apache.pdfbox.exceptions.CryptographyException;
import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
@@ -50,7 +49,7 @@ public class UsingTextMatrix
* @throws IOException If there is an error writing the data.
*/
public void doIt( String message, String outfile )
- throws IOException, CryptographyException, SignatureException
+ throws IOException, SignatureException
{
// the document
PDDocument doc = null;
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/persistence/CopyDoc.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/persistence/CopyDoc.java?rev=1576587&r1=1576586&r2=1576587&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/persistence/CopyDoc.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/persistence/CopyDoc.java Wed Mar 12 05:50:43 2014
@@ -23,7 +23,6 @@ import java.io.InputStream;
import java.io.OutputStream;
import org.apache.pdfbox.cos.COSDocument;
-import org.apache.pdfbox.exceptions.CryptographyException;
import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdfparser.PDFParser;
import org.apache.pdfbox.pdfwriter.COSWriter;
@@ -54,7 +53,7 @@ public class CopyDoc
* @throws IOException If there is an error parsing the document.
*/
public void doIt(String in, String out)
- throws IOException, CryptographyException, SignatureException
+ throws IOException, SignatureException
{
InputStream is = null;
OutputStream os = null;
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateSignature.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateSignature.java?rev=1576587&r1=1576586&r2=1576587&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateSignature.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateSignature.java Wed Mar 12 05:50:43 2014
@@ -36,7 +36,6 @@ import java.util.Calendar;
import java.util.Enumeration;
import java.util.List;
-import org.apache.pdfbox.exceptions.CryptographyException;
import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.interactive.digitalsignature.PDSignature;
@@ -116,7 +115,7 @@ public class CreateSignature implements
* @throws SignatureException
*/
public File signPDF(File document)
- throws IOException, CryptographyException, SignatureException
+ throws IOException, SignatureException
{
byte[] buffer = new byte[8 * 1024];
if (document == null || !document.exists())
@@ -210,7 +209,7 @@ public class CreateSignature implements
}
public static void main(String[] args) throws KeyStoreException, CertificateException,
- IOException, CryptographyException, SignatureException, NoSuchAlgorithmException
+ IOException, SignatureException, NoSuchAlgorithmException
{
if (args.length != 3)
{
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateVisibleSignature.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateVisibleSignature.java?rev=1576587&r1=1576586&r2=1576587&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateVisibleSignature.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateVisibleSignature.java Wed Mar 12 05:50:43 2014
@@ -36,7 +36,6 @@ import java.util.Calendar;
import java.util.Enumeration;
import java.util.List;
-import org.apache.pdfbox.exceptions.CryptographyException;
import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.interactive.digitalsignature.PDSignature;
@@ -116,7 +115,7 @@ public class CreateVisibleSignature impl
* @throws SignatureException
*/
public File signPDF(File document, PDVisibleSigProperties signatureProperties)
- throws IOException, CryptographyException, SignatureException
+ throws IOException, SignatureException
{
byte[] buffer = new byte[8 * 1024];
if (document == null || !document.exists())
@@ -220,7 +219,7 @@ public class CreateVisibleSignature impl
* [3] image of visible signature
*/
public static void main(String[] args) throws KeyStoreException, CertificateException,
- IOException, CryptographyException, SignatureException, NoSuchAlgorithmException
+ IOException, SignatureException, NoSuchAlgorithmException
{
if (args.length != 4)
Modified: pdfbox/trunk/examples/src/test/java/org/apache/pdfbox/examples/pdmodel/TestRubberStampWithImage.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/test/java/org/apache/pdfbox/examples/pdmodel/TestRubberStampWithImage.java?rev=1576587&r1=1576586&r2=1576587&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/test/java/org/apache/pdfbox/examples/pdmodel/TestRubberStampWithImage.java (original)
+++ pdfbox/trunk/examples/src/test/java/org/apache/pdfbox/examples/pdmodel/TestRubberStampWithImage.java Wed Mar 12 05:50:43 2014
@@ -17,7 +17,6 @@
package org.apache.pdfbox.examples.pdmodel;
import junit.framework.TestCase;
-import org.apache.pdfbox.exceptions.CryptographyException;
import org.apache.pdfbox.exceptions.SignatureException;
import java.io.File;
@@ -29,7 +28,7 @@ import java.io.IOException;
public class TestRubberStampWithImage extends TestCase
{
public void test()
- throws IOException, CryptographyException, SignatureException
+ throws IOException, SignatureException
{
String documentFile = "src/test/resources/org.apache.pdfbox.examples.pdmodel/document.pdf";
String stampFile = "src/test/resources/org.apache.pdfbox.examples.pdmodel/stamp.jpg";
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSArray.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSArray.java?rev=1576587&r1=1576586&r2=1576587&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSArray.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSArray.java Wed Mar 12 05:50:43 2014
@@ -22,7 +22,6 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.List;
-import org.apache.pdfbox.exceptions.CryptographyException;
import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdmodel.common.COSObjectable;
@@ -514,8 +513,7 @@ public class COSArray extends COSBase im
* @throws IOException If an error occurs while visiting this object.
*/
@Override
- public Object accept(ICOSVisitor visitor)
- throws IOException, CryptographyException, SignatureException
+ public Object accept(ICOSVisitor visitor) throws IOException, SignatureException
{
return visitor.visitFromArray(this);
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSBase.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSBase.java?rev=1576587&r1=1576586&r2=1576587&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSBase.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSBase.java Wed Mar 12 05:50:43 2014
@@ -16,7 +16,6 @@
*/
package org.apache.pdfbox.cos;
-import org.apache.pdfbox.exceptions.CryptographyException;
import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdmodel.common.COSObjectable;
@@ -56,10 +55,8 @@ public abstract class COSBase implements
* @param visitor The object to notify when visiting this object.
* @return any object, depending on the visitor implementation, or null
* @throws IOException If an error occurs while visiting this object.
- * @throws CryptographyException If an error occurs while visiting this object.
*/
- public abstract Object accept(ICOSVisitor visitor)
- throws IOException, CryptographyException, SignatureException;
+ public abstract Object accept(ICOSVisitor visitor) throws IOException, SignatureException;
public void setNeedToBeUpdate(boolean flag)
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java?rev=1576587&r1=1576586&r2=1576587&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java Wed Mar 12 05:50:43 2014
@@ -25,7 +25,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.pdfbox.exceptions.CryptographyException;
import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdmodel.common.COSObjectable;
import org.apache.pdfbox.util.DateConverter;
@@ -1373,10 +1372,8 @@ public class COSDictionary extends COSBa
* @return The object that the visitor returns.
*
* @throws IOException If there is an error visiting this object.
- * @throws CryptographyException If there is an error visiting this object.
*/
- public Object accept(ICOSVisitor visitor)
- throws IOException, CryptographyException, SignatureException
+ public Object accept(ICOSVisitor visitor) throws IOException, SignatureException
{
return visitor.visitFromDictionary(this);
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDocument.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDocument.java?rev=1576587&r1=1576586&r2=1576587&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDocument.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDocument.java Wed Mar 12 05:50:43 2014
@@ -28,7 +28,6 @@ import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.pdfbox.exceptions.CryptographyException;
import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.io.RandomAccess;
import org.apache.pdfbox.io.RandomAccessBuffer;
@@ -552,8 +551,7 @@ public class COSDocument extends COSBase
* @throws IOException If an error occurs while visiting this object.
*/
@Override
- public Object accept(ICOSVisitor visitor)
- throws IOException, CryptographyException, SignatureException
+ public Object accept(ICOSVisitor visitor) throws IOException, SignatureException
{
return visitor.visitFromDocument( this );
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObject.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObject.java?rev=1576587&r1=1576586&r2=1576587&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObject.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObject.java Wed Mar 12 05:50:43 2014
@@ -16,7 +16,6 @@
*/
package org.apache.pdfbox.cos;
-import org.apache.pdfbox.exceptions.CryptographyException;
import org.apache.pdfbox.exceptions.SignatureException;
import java.io.IOException;
@@ -202,7 +201,7 @@ public class COSObject extends COSBase
* @return any object, depending on the visitor implementation, or null
* @throws IOException If an error occurs while visiting this object.
*/
- public Object accept( ICOSVisitor visitor ) throws IOException, CryptographyException, SignatureException
+ public Object accept( ICOSVisitor visitor ) throws IOException, SignatureException
{
return getObject() != null ? getObject().accept( visitor ) : COSNull.NULL.accept( visitor );
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSStream.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSStream.java?rev=1576587&r1=1576586&r2=1576587&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSStream.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSStream.java Wed Mar 12 05:50:43 2014
@@ -26,7 +26,6 @@ import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.pdfbox.exceptions.CryptographyException;
import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.filter.DecodeResult;
import org.apache.pdfbox.filter.Filter;
@@ -247,10 +246,8 @@ public class COSStream extends COSDictio
*
* @param visitor The object to notify when visiting this object.
* @return any object, depending on the visitor implementation, or null
- * @throws CryptographyException If an error occurs while visiting this object.
*/
- public Object accept(ICOSVisitor visitor)
- throws IOException, CryptographyException, SignatureException
+ public Object accept(ICOSVisitor visitor) throws IOException, SignatureException
{
return visitor.visitFromStream(this);
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSString.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSString.java?rev=1576587&r1=1576586&r2=1576587&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSString.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSString.java Wed Mar 12 05:50:43 2014
@@ -21,7 +21,6 @@ import java.io.IOException;
import java.io.OutputStream;
import org.apache.pdfbox.encoding.PdfDocEncoding;
-import org.apache.pdfbox.exceptions.CryptographyException;
import org.apache.pdfbox.persistence.util.COSHEXTable;
/**
@@ -472,10 +471,9 @@ public class COSString extends COSBase
* @param visitor The object to notify when visiting this object.
* @return any object, depending on the visitor implementation, or null
* @throws IOException If an error occurs while visiting this object.
- * @throws CryptographyException If an error occurs while visiting this object.
*/
@Override
- public Object accept(ICOSVisitor visitor) throws IOException, CryptographyException
+ public Object accept(ICOSVisitor visitor) throws IOException
{
return visitor.visitFromString(this);
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/ICOSVisitor.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/ICOSVisitor.java?rev=1576587&r1=1576586&r2=1576587&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/ICOSVisitor.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/ICOSVisitor.java Wed Mar 12 05:50:43 2014
@@ -16,7 +16,6 @@
*/
package org.apache.pdfbox.cos;
-import org.apache.pdfbox.exceptions.CryptographyException;
import org.apache.pdfbox.exceptions.SignatureException;
import java.io.IOException;
@@ -36,8 +35,7 @@ public interface ICOSVisitor
* @return any Object depending on the visitor implementation, or null
* @throws IOException If there is an error while visiting this object.
*/
- public Object visitFromArray( COSArray obj ) throws IOException, CryptographyException,
- SignatureException;
+ public Object visitFromArray( COSArray obj ) throws IOException, SignatureException;
/**
* Notification of visit to boolean object.
@@ -55,8 +53,7 @@ public interface ICOSVisitor
* @return any Object depending on the visitor implementation, or null
* @throws IOException If there is an error while visiting this object.
*/
- public Object visitFromDictionary( COSDictionary obj )
- throws IOException, CryptographyException, SignatureException;
+ public Object visitFromDictionary( COSDictionary obj ) throws IOException, SignatureException;
/**
* Notification of visit to document object.
@@ -66,8 +63,7 @@ public interface ICOSVisitor
* @throws IOException If there is an error while visiting this object.
* @throws SignatureException If there is an error while visiting this object.
*/
- public Object visitFromDocument( COSDocument obj )
- throws IOException, CryptographyException, SignatureException;
+ public Object visitFromDocument( COSDocument obj ) throws IOException, SignatureException;
/**
* Notification of visit to float object.
@@ -111,10 +107,8 @@ public interface ICOSVisitor
* @param obj The Object that is being visited.
* @return any Object depending on the visitor implementation, or null
* @throws IOException If there is an error while visiting this object.
- * @throws CryptographyException If there is an error while visiting this object.
*/
- public Object visitFromStream( COSStream obj )
- throws IOException, CryptographyException, SignatureException;
+ public Object visitFromStream( COSStream obj ) throws IOException, SignatureException;
/**
* Notification of visit to string object.
@@ -122,7 +116,6 @@ public interface ICOSVisitor
* @param obj The Object that is being visited.
* @return any Object depending on the visitor implementation, or null
* @throws IOException If there is an error while visiting this object.
- * @throws CryptographyException If there is an error while visiting this object.
*/
- public Object visitFromString( COSString obj ) throws IOException, CryptographyException;
+ public Object visitFromString( COSString obj ) throws IOException;
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encryption/DocumentEncryption.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encryption/DocumentEncryption.java?rev=1576587&r1=1576586&r2=1576587&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encryption/DocumentEncryption.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encryption/DocumentEncryption.java Wed Mar 12 05:50:43 2014
@@ -37,7 +37,6 @@ import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.cos.COSObject;
import org.apache.pdfbox.cos.COSStream;
import org.apache.pdfbox.cos.COSString;
-import org.apache.pdfbox.exceptions.CryptographyException;
import org.apache.pdfbox.exceptions.InvalidPasswordException;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.encryption.PDStandardEncryption;
@@ -94,11 +93,9 @@ public class DocumentEncryption
* This will encrypt the given document, given the owner password and user password.
* The encryption method used is the standard filter.
*
- * @throws CryptographyException If an error occurs during encryption.
* @throws IOException If there is an error accessing the data.
*/
- public void initForEncryption()
- throws CryptographyException, IOException
+ public void initForEncryption() throws IOException
{
String ownerPassword = pdDocument.getOwnerPasswordForEncryption();
String userPassword = pdDocument.getUserPasswordForEncryption();
@@ -173,12 +170,10 @@ public class DocumentEncryption
*
* @param password The password for the document.
*
- * @throws CryptographyException If there is an error decrypting the document.
* @throws IOException If there is an error getting the stream data.
* @throws InvalidPasswordException If the password is not a user or owner password.
*/
- public void decryptDocument( String password )
- throws CryptographyException, IOException, InvalidPasswordException
+ public void decryptDocument( String password ) throws IOException, InvalidPasswordException
{
if( password == null )
{
@@ -272,11 +267,9 @@ public class DocumentEncryption
*
* @param object The object to decrypt.
*
- * @throws CryptographyException If there is an error decrypting the stream.
* @throws IOException If there is an error getting the stream data.
*/
- private void decryptObject( COSObject object )
- throws CryptographyException, IOException
+ private void decryptObject( COSObject object ) throws IOException
{
long objNum = object.getObjectNumber().intValue();
long genNum = object.getGenerationNumber().intValue();
@@ -291,11 +284,9 @@ public class DocumentEncryption
* @param objNum The object number.
* @param genNum The object generation Number.
*
- * @throws CryptographyException If there is an error decrypting the stream.
* @throws IOException If there is an error getting the stream data.
*/
- public void decrypt( Object obj, long objNum, long genNum )
- throws CryptographyException, IOException
+ public void decrypt( Object obj, long objNum, long genNum ) throws IOException
{
if( !objects.contains( obj ) )
{
@@ -327,11 +318,9 @@ public class DocumentEncryption
* @param objNum The object number.
* @param genNum The object generation number.
*
- * @throws CryptographyException If there is an error getting the stream.
* @throws IOException If there is an error getting the stream data.
*/
- private void decryptStream( COSStream stream, long objNum, long genNum )
- throws CryptographyException, IOException
+ private void decryptStream( COSStream stream, long objNum, long genNum ) throws IOException
{
decryptDictionary( stream, objNum, genNum );
InputStream encryptedStream = stream.getFilteredStream();
@@ -349,11 +338,10 @@ public class DocumentEncryption
* @param objNum The object number.
* @param genNum The object generation number.
*
- * @throws CryptographyException If there is an error decrypting the document.
* @throws IOException If there is an error creating a new string.
*/
private void decryptDictionary( COSDictionary dictionary, long objNum, long genNum )
- throws CryptographyException, IOException
+ throws IOException
{
for( Map.Entry<COSName, COSBase> entry : dictionary.entrySet() )
{
@@ -375,11 +363,9 @@ public class DocumentEncryption
* @param objNum The object number.
* @param genNum The object generation number.
*
- * @throws CryptographyException If an error occurs during decryption.
* @throws IOException If an error occurs writing the new string.
*/
- private void decryptString( COSString string, long objNum, long genNum )
- throws CryptographyException, IOException
+ private void decryptString( COSString string, long objNum, long genNum ) throws IOException
{
ByteArrayInputStream data = new ByteArrayInputStream( string.getBytes() );
ByteArrayOutputStream buffer = new ByteArrayOutputStream();
@@ -399,11 +385,9 @@ public class DocumentEncryption
* @param objNum The object number.
* @param genNum The object generation number.
*
- * @throws CryptographyException If an error occurs during decryption.
* @throws IOException If there is an error accessing the data.
*/
- private void decryptArray( COSArray array, long objNum, long genNum )
- throws CryptographyException, IOException
+ private void decryptArray( COSArray array, long objNum, long genNum ) throws IOException
{
for( int i=0; i<array.size(); i++ )
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encryption/PDFEncryption.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encryption/PDFEncryption.java?rev=1576587&r1=1576586&r2=1576587&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encryption/PDFEncryption.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encryption/PDFEncryption.java Wed Mar 12 05:50:43 2014
@@ -25,8 +25,6 @@ import java.io.OutputStream;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
-import org.apache.pdfbox.exceptions.CryptographyException;
-
/**
* This class will deal with PDF encryption algorithms.
*
@@ -63,7 +61,6 @@ public final class PDFEncryption
* @param data The data to encrypt/decrypt.
* @param output The stream to write to.
*
- * @throws CryptographyException If there is an error encrypting the data.
* @throws IOException If there is an io error.
*/
public final void encryptData(
@@ -72,7 +69,7 @@ public final class PDFEncryption
byte[] key,
InputStream data,
OutputStream output )
- throws CryptographyException, IOException
+ throws IOException
{
byte[] newKey = new byte[ key.length + 5 ];
System.arraycopy( key, 0, newKey, 0, key.length );
@@ -113,7 +110,6 @@ public final class PDFEncryption
*
* @return The plaintext padded user password.
*
- * @throws CryptographyException If there is an error getting the user password.
* @throws IOException If there is an error reading data.
*/
public final byte[] getUserPassword(
@@ -121,7 +117,7 @@ public final class PDFEncryption
byte[] o,
int revision,
long length )
- throws CryptographyException, IOException
+ throws IOException
{
ByteArrayOutputStream result = new ByteArrayOutputStream();
@@ -145,7 +141,7 @@ public final class PDFEncryption
}
if( revision == 2 && length != 5 )
{
- throw new CryptographyException(
+ throw new IOException(
"Error: Expected length=5 actual=" + length );
}
@@ -215,7 +211,6 @@ public final class PDFEncryption
*
* @return true if the owner password matches the one from the document.
*
- * @throws CryptographyException If there is an error while executing crypt functions.
* @throws IOException If there is an error while checking owner password.
*/
public final boolean isOwnerPassword(
@@ -226,7 +221,7 @@ public final class PDFEncryption
byte[] id,
int revision,
int length)
- throws CryptographyException, IOException
+ throws IOException
{
byte[] userPassword = getUserPassword( ownerPassword, o, revision, length );
return isUserPassword( userPassword, u, o, permissions, id, revision, length );
@@ -247,7 +242,6 @@ public final class PDFEncryption
*
* @return true If this is the correct user password.
*
- * @throws CryptographyException If there is an error computing the value.
* @throws IOException If there is an IO error while computing the owners password.
*/
public final boolean isUserPassword(
@@ -258,7 +252,7 @@ public final class PDFEncryption
byte[] id,
int revision,
int length)
- throws CryptographyException, IOException
+ throws IOException
{
boolean matches = false;
//STEP 1
@@ -325,7 +319,6 @@ public final class PDFEncryption
*
* @return The user password.
*
- * @throws CryptographyException If there is an error computing the user password.
* @throws IOException If there is an IO error.
*/
public final byte[] computeUserPassword(
@@ -335,7 +328,7 @@ public final class PDFEncryption
byte[] id,
int revision,
int length )
- throws CryptographyException, IOException
+ throws IOException
{
ByteArrayOutputStream result = new ByteArrayOutputStream();
//STEP 1
@@ -395,7 +388,7 @@ public final class PDFEncryption
*
* @return The encryption key.
*
- * @throws CryptographyException If there is an error computing the key.
+ * @throws IOException If there is an error computing the key.
*/
public final byte[] computeEncryptedKey(
byte[] password,
@@ -404,7 +397,7 @@ public final class PDFEncryption
byte[] id,
int revision,
int length )
- throws CryptographyException
+ throws IOException
{
byte[] result = new byte[ length ];
@@ -448,7 +441,7 @@ public final class PDFEncryption
//step 7
if( revision == 2 && length != 5 )
{
- throw new CryptographyException(
+ throw new IOException(
"Error: length should be 5 when revision is two actual=" + length );
}
System.arraycopy( digest, 0, result, 0, length );
@@ -465,7 +458,6 @@ public final class PDFEncryption
*
* @return The computed owner password.
*
- * @throws CryptographyException If there is an error computing O.
* @throws IOException If there is an error computing O.
*/
public final byte[] computeOwnerPassword(
@@ -473,7 +465,7 @@ public final class PDFEncryption
byte[] userPassword,
int revision,
int length )
- throws CryptographyException, IOException
+ throws IOException
{
//STEP 1
byte[] ownerPadded = truncateOrPad( ownerPassword );
@@ -495,7 +487,7 @@ public final class PDFEncryption
}
if( revision == 2 && length != 5 )
{
- throw new CryptographyException(
+ throw new IOException(
"Error: Expected length=5 actual=" + length );
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/NonSequentialPDFParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/NonSequentialPDFParser.java?rev=1576587&r1=1576586&r2=1576587&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/NonSequentialPDFParser.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/NonSequentialPDFParser.java Wed Mar 12 05:50:43 2014
@@ -50,7 +50,6 @@ import org.apache.pdfbox.cos.COSNumber;
import org.apache.pdfbox.cos.COSObject;
import org.apache.pdfbox.cos.COSStream;
import org.apache.pdfbox.cos.COSString;
-import org.apache.pdfbox.exceptions.CryptographyException;
import org.apache.pdfbox.io.IOUtils;
import org.apache.pdfbox.io.PushBackInputStream;
import org.apache.pdfbox.io.RandomAccess;
@@ -1272,16 +1271,7 @@ public class NonSequentialPDFParser exte
if (securityHandler != null)
{
- try
- {
- securityHandler.decryptStream(stream, objNr, objGenNr);
- }
- catch (CryptographyException ce)
- {
- throw new IOException("Error decrypting stream object " + objNr + ": "
- + ce.getMessage()
- /* , ce // TODO: remove remark with Java 1.6 */);
- }
+ securityHandler.decryptStream(stream, objNr, objGenNr);
}
pb = stream;
}
@@ -1408,15 +1398,7 @@ public class NonSequentialPDFParser exte
*/
protected final void decrypt(COSString str, long objNr, long objGenNr) throws IOException
{
- try
- {
- securityHandler.decryptString(str, objNr, objGenNr);
- }
- catch (CryptographyException ce)
- {
- throw new IOException("Error decrypting string: " + ce.getMessage()
- /* , ce // TODO: remove remark with Java 1.6 */);
- }
+ securityHandler.decryptString(str, objNr, objGenNr);
}
// ------------------------------------------------------------------------
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java?rev=1576587&r1=1576586&r2=1576587&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java Wed Mar 12 05:50:43 2014
@@ -51,7 +51,6 @@ import org.apache.pdfbox.cos.COSObject;
import org.apache.pdfbox.cos.COSStream;
import org.apache.pdfbox.cos.COSString;
import org.apache.pdfbox.cos.ICOSVisitor;
-import org.apache.pdfbox.exceptions.CryptographyException;
import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdfparser.PDFXRefStream;
import org.apache.pdfbox.pdmodel.PDDocument;
@@ -410,7 +409,7 @@ public class COSWriter implements ICOSVi
*
* @throws IOException If there is an error writing the data.
*/
- protected void doWriteBody(COSDocument doc) throws IOException, CryptographyException, SignatureException
+ protected void doWriteBody(COSDocument doc) throws IOException, SignatureException
{
COSDictionary trailer = doc.getTrailer();
COSDictionary root = (COSDictionary)trailer.getDictionaryObject( COSName.ROOT );
@@ -493,8 +492,7 @@ public class COSWriter implements ICOSVi
*
* @throws IOException if the output cannot be written
*/
- public void doWriteObject( COSBase obj )
- throws IOException, CryptographyException, SignatureException
+ public void doWriteObject( COSBase obj ) throws IOException, SignatureException
{
writtenObjects.add( obj );
if(obj instanceof COSDictionary)
@@ -548,8 +546,7 @@ public class COSWriter implements ICOSVi
*
* @throws IOException If there is an IOError while writing the document.
*/
- protected void doWriteTrailer(COSDocument doc)
- throws IOException, CryptographyException, SignatureException
+ protected void doWriteTrailer(COSDocument doc) throws IOException, SignatureException
{
getStandardOutput().write(TRAILER);
getStandardOutput().writeEOL();
@@ -648,7 +645,7 @@ public class COSWriter implements ICOSVi
}
private void doWriteXRefInc(COSDocument doc, long hybridPrev) throws IOException,
- CryptographyException, SignatureException
+ SignatureException
{
if (doc.isXRefStream() || hybridPrev != -1)
{
@@ -891,8 +888,7 @@ public class COSWriter implements ICOSVi
}
@Override
- public Object visitFromArray( COSArray obj )
- throws IOException, CryptographyException, SignatureException
+ public Object visitFromArray( COSArray obj ) throws IOException, SignatureException
{
int count = 0;
getStandardOutput().write(ARRAY_OPEN);
@@ -964,8 +960,7 @@ public class COSWriter implements ICOSVi
}
@Override
- public Object visitFromDictionary(COSDictionary obj)
- throws IOException, CryptographyException, SignatureException
+ public Object visitFromDictionary(COSDictionary obj) throws IOException, SignatureException
{
getStandardOutput().write(DICT_OPEN);
getStandardOutput().writeEOL();
@@ -1058,8 +1053,7 @@ public class COSWriter implements ICOSVi
}
@Override
- public Object visitFromDocument(COSDocument doc)
- throws IOException, CryptographyException, SignatureException
+ public Object visitFromDocument(COSDocument doc) throws IOException, SignatureException
{
if(!incrementalUpdate)
{
@@ -1153,8 +1147,7 @@ public class COSWriter implements ICOSVi
}
@Override
- public Object visitFromStream(COSStream obj)
- throws IOException, CryptographyException, SignatureException
+ public Object visitFromStream(COSStream obj) throws IOException, SignatureException
{
if (willEncrypt)
{
@@ -1220,7 +1213,7 @@ public class COSWriter implements ICOSVi
}
@Override
- public Object visitFromString(COSString obj) throws IOException, CryptographyException
+ public Object visitFromString(COSString obj) throws IOException
{
if(willEncrypt)
{
@@ -1240,8 +1233,7 @@ public class COSWriter implements ICOSVi
* @throws IOException If an error occurs while generating the data.
* @param doc The document to write.
*/
- public void write(COSDocument doc)
- throws IOException, CryptographyException, SignatureException
+ public void write(COSDocument doc) throws IOException, SignatureException
{
PDDocument pdDoc = new PDDocument( doc );
write( pdDoc );
@@ -1253,9 +1245,8 @@ public class COSWriter implements ICOSVi
* @param doc The document to write.
*
* @throws IOException If an error occurs while generating the data.
- * @throws CryptographyException If an error occurs while generating the data.
*/
- public void write(PDDocument doc) throws IOException, CryptographyException, SignatureException
+ public void write(PDDocument doc) throws IOException, SignatureException
{
Long idTime = doc.getDocumentId() == null ? System.currentTimeMillis() :
doc.getDocumentId();
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocument.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocument.java?rev=1576587&r1=1576586&r2=1576587&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocument.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocument.java Wed Mar 12 05:50:43 2014
@@ -39,7 +39,6 @@ import org.apache.pdfbox.cos.COSInteger;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.cos.COSObject;
import org.apache.pdfbox.cos.COSStream;
-import org.apache.pdfbox.exceptions.CryptographyException;
import org.apache.pdfbox.exceptions.InvalidPasswordException;
import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.io.RandomAccess;
@@ -863,13 +862,12 @@ public class PDDocument implements Close
* security layer instead and the openProtection method especially.
*
* @param password Either the user or owner password.
- *
- * @throws CryptographyException If there is an error decrypting the document.
+ *
* @throws IOException If there is an error getting the stream data.
* @throws InvalidPasswordException If the password is not a user or owner password.
*/
@Deprecated
- public void decrypt(String password) throws CryptographyException, IOException, InvalidPasswordException
+ public void decrypt(String password) throws IOException, InvalidPasswordException
{
StandardDecryptionMaterial m = new StandardDecryptionMaterial(password);
openProtection(m);
@@ -1181,11 +1179,9 @@ public class PDDocument implements Close
* @param fileName The file to save as.
*
* @throws IOException if the output could not be written
- * @throws CryptographyException if something went wrong during a cryptography operation
* @throws SignatureException if signing failed
*/
- public void save(String fileName)
- throws IOException, CryptographyException, SignatureException
+ public void save(String fileName) throws IOException, SignatureException
{
save(new File(fileName));
}
@@ -1196,11 +1192,9 @@ public class PDDocument implements Close
* @param file The file to save as.
*
* @throws IOException if the output could not be written
- * @throws CryptographyException if something went wrong during a cryptography operation
* @throws SignatureException if signing failed
*/
- public void save(File file)
- throws IOException, CryptographyException, SignatureException
+ public void save(File file) throws IOException, SignatureException
{
save(new FileOutputStream(file));
}
@@ -1211,11 +1205,9 @@ public class PDDocument implements Close
* @param output The stream to write to.
*
* @throws IOException if the output could not be written
- * @throws CryptographyException if something went wrong during a cryptography operation
* @throws SignatureException if signing failed
*/
- public void save(OutputStream output)
- throws IOException, CryptographyException, SignatureException
+ public void save(OutputStream output) throws IOException, SignatureException
{
// update the count in case any pages have been added behind the scenes.
getDocumentCatalog().getPages().updateCount();
@@ -1240,11 +1232,9 @@ public class PDDocument implements Close
*
* @param fileName the filename to be used
* @throws IOException if the output could not be written
- * @throws CryptographyException if something went wrong during a cryptography operation
* @throws SignatureException if signing failed
*/
- public void saveIncremental(String fileName)
- throws IOException, CryptographyException, SignatureException
+ public void saveIncremental(String fileName) throws IOException, SignatureException
{
saveIncremental(new FileInputStream(fileName), new FileOutputStream(fileName, true));
}
@@ -1255,11 +1245,10 @@ public class PDDocument implements Close
* @param input stream to read
* @param output stream to write
* @throws IOException if the output could not be written
- * @throws CryptographyException if something went wrong during a cryptography operation
* @throws SignatureException if signing failed
*/
public void saveIncremental(FileInputStream input, OutputStream output)
- throws IOException, CryptographyException, SignatureException
+ throws IOException, SignatureException
{
// update the count in case any pages have been added behind the scenes.
getDocumentCatalog().getPages().updateCount();
@@ -1360,10 +1349,8 @@ public class PDDocument implements Close
* @param decryptionMaterial The decryption material (password or certificate).
*
* @throws IOException If there is an error reading cryptographic information.
- * @throws CryptographyException If there is an error during decryption.
*/
- public void openProtection(DecryptionMaterial decryptionMaterial)
- throws IOException, CryptographyException
+ public void openProtection(DecryptionMaterial decryptionMaterial) throws IOException
{
PDEncryptionDictionary encryption = getEncryptionDictionary();
if (encryption.getFilter() != null)
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/COSStreamArray.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/COSStreamArray.java?rev=1576587&r1=1576586&r2=1576587&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/COSStreamArray.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/COSStreamArray.java Wed Mar 12 05:50:43 2014
@@ -33,7 +33,6 @@ import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.cos.COSStream;
import org.apache.pdfbox.cos.ICOSVisitor;
-import org.apache.pdfbox.exceptions.CryptographyException;
import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.io.RandomAccess;
@@ -212,11 +211,9 @@ public class COSStreamArray extends COSS
* @param visitor The object to notify when visiting this object.
* @return any object, depending on the visitor implementation, or null
* @throws IOException if the output could not be written
- * @throws CryptographyException if something went wrong during a cryptography operation
* @throws SignatureException if signing failed
*/
- public Object accept(ICOSVisitor visitor)
- throws IOException, CryptographyException, SignatureException
+ public Object accept(ICOSVisitor visitor) throws IOException, SignatureException
{
return streams.accept( visitor );
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java?rev=1576587&r1=1576586&r2=1576587&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java Wed Mar 12 05:50:43 2014
@@ -63,7 +63,6 @@ import org.bouncycastle.cms.RecipientInf
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSString;
-import org.apache.pdfbox.exceptions.CryptographyException;
import org.apache.pdfbox.pdmodel.PDDocument;
/**
@@ -105,11 +104,9 @@ public final class PublicKeySecurityHand
* @param doc The document to decrypt.
* @param decryptionMaterial The data used to decrypt the document.
*
- * @throws CryptographyException If there is an error during decryption.
* @throws IOException If there is an error accessing data.
*/
- public void decryptDocument(PDDocument doc, DecryptionMaterial decryptionMaterial)
- throws CryptographyException, IOException
+ public void decryptDocument(PDDocument doc, DecryptionMaterial decryptionMaterial) throws IOException
{
this.document = doc;
@@ -132,11 +129,10 @@ public final class PublicKeySecurityHand
* @param decryptionMaterial Information used to decrypt the document.
*
* @throws IOException If there is an error accessing data.
- * @throws CryptographyException If there is an error with decryption.
*/
public void prepareForDecryption(PDEncryptionDictionary encDictionary, COSArray documentIDArray,
DecryptionMaterial decryptionMaterial)
- throws IOException, CryptographyException
+ throws IOException
{
if(encDictionary.getLength() != 0)
{
@@ -145,7 +141,7 @@ public final class PublicKeySecurityHand
if(!(decryptionMaterial instanceof PublicKeyDecryptionMaterial))
{
- throw new CryptographyException(
+ throw new IOException(
"Provided decryption material is not compatible with the document");
}
@@ -188,11 +184,11 @@ public final class PublicKeySecurityHand
}
if(!foundRecipient || envelopedData == null)
{
- throw new CryptographyException("The certificate matches no recipient entry");
+ throw new IOException("The certificate matches no recipient entry");
}
if(envelopedData.length != 24)
{
- throw new CryptographyException("The enveloped data does not contain 24 bytes");
+ throw new IOException("The enveloped data does not contain 24 bytes");
}
// now envelopedData contains:
// - the 20 bytes seed
@@ -229,15 +225,15 @@ public final class PublicKeySecurityHand
}
catch(CMSException e)
{
- throw new CryptographyException(e);
+ throw new IOException(e);
}
catch(KeyStoreException e)
{
- throw new CryptographyException(e);
+ throw new IOException(e);
}
catch(NoSuchProviderException e)
{
- throw new CryptographyException(e);
+ throw new IOException(e);
}
}
@@ -246,11 +242,10 @@ public final class PublicKeySecurityHand
*
* @param doc The document that will be encrypted.
*
- * @throws CryptographyException If there is an error while encrypting.
+ * @throws IOException If there is an error while encrypting.
*/
- public void prepareDocumentForEncryption(PDDocument doc) throws CryptographyException
+ public void prepareDocumentForEncryption(PDDocument doc) throws IOException
{
-
try
{
Security.addProvider(new BouncyCastleProvider());
@@ -363,11 +358,7 @@ public final class PublicKeySecurityHand
}
catch(GeneralSecurityException e)
{
- throw new CryptographyException(e);
- }
- catch(IOException e)
- {
- throw new CryptographyException(e);
+ throw new IOException(e);
}
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java?rev=1576587&r1=1576586&r2=1576587&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java Wed Mar 12 05:50:43 2014
@@ -48,7 +48,6 @@ import org.apache.pdfbox.cos.COSObject;
import org.apache.pdfbox.cos.COSStream;
import org.apache.pdfbox.cos.COSString;
import org.apache.pdfbox.encryption.ARCFour;
-import org.apache.pdfbox.exceptions.CryptographyException;
import org.apache.pdfbox.pdmodel.PDDocument;
/**
@@ -96,10 +95,9 @@ public abstract class SecurityHandler
*
* @param doc The document that will be encrypted.
*
- * @throws CryptographyException If there is an error while preparing.
* @throws IOException If there is an error with the document.
*/
- public abstract void prepareDocumentForEncryption(PDDocument doc) throws CryptographyException, IOException;
+ public abstract void prepareDocumentForEncryption(PDDocument doc) throws IOException;
/**
* Prepares everything to decrypt the document.
@@ -112,30 +110,26 @@ public abstract class SecurityHandler
* @param decryptionMaterial Information used to decrypt the document.
*
* @throws IOException If there is an error accessing data.
- * @throws CryptographyException If there is an error with decryption.
*/
public abstract void prepareForDecryption(PDEncryptionDictionary encDictionary, COSArray documentIDArray,
- DecryptionMaterial decryptionMaterial) throws CryptographyException, IOException;
+ DecryptionMaterial decryptionMaterial) throws IOException;
/**
* Prepare the document for decryption.
*
* @param doc The document to decrypt.
* @param mat Information required to decrypt the document.
- * @throws CryptographyException If there is an error while preparing.
* @throws IOException If there is an error with the document.
*/
- public abstract void decryptDocument(PDDocument doc, DecryptionMaterial mat) throws CryptographyException,
- IOException;
+ public abstract void decryptDocument(PDDocument doc, DecryptionMaterial mat) throws IOException;
/**
* This method must be called by an implementation of this class to really proceed
* to decryption.
*
* @throws IOException If there is an error in the decryption.
- * @throws CryptographyException If there is an error in the decryption.
*/
- protected void proceedDecryption() throws IOException, CryptographyException
+ protected void proceedDecryption() throws IOException
{
COSDictionary trailer = document.getDocument().getTrailer();
@@ -193,15 +187,14 @@ public abstract class SecurityHandler
* @param genNumber The data generation number.
* @param data The data to encrypt.
* @param output The output to write the encrypted data to.
- * @throws CryptographyException If there is an error during the encryption.
* @throws IOException If there is an error reading the data.
* @deprecated While this works fine for RC4 encryption, it will never decrypt AES data
* You should use encryptData(objectNumber, genNumber, data, output, decrypt)
* which can do everything. This function is just here for compatibility
* reasons and will be removed in the future.
*/
- public void encryptData(long objectNumber, long genNumber, InputStream data, OutputStream output)
- throws CryptographyException, IOException
+ public void encryptData(long objectNumber, long genNumber, InputStream data,
+ OutputStream output) throws IOException
{
// default to encrypting since the function is named "encryptData"
encryptData(objectNumber, genNumber, data, output, false);
@@ -216,11 +209,10 @@ public abstract class SecurityHandler
* @param output The output to write the encrypted data to.
* @param decrypt true to decrypt the data, false to encrypt it
*
- * @throws CryptographyException If there is an error during the encryption.
* @throws IOException If there is an error reading the data.
*/
- public void encryptData(long objectNumber, long genNumber, InputStream data, OutputStream output, boolean decrypt)
- throws CryptographyException, IOException
+ public void encryptData(long objectNumber, long genNumber, InputStream data,
+ OutputStream output, boolean decrypt) throws IOException
{
if (useAES && !decrypt)
{
@@ -321,10 +313,9 @@ public abstract class SecurityHandler
*
* @param object The object to decrypt.
*
- * @throws CryptographyException If there is an error decrypting the stream.
* @throws IOException If there is an error getting the stream data.
*/
- private void decryptObject(COSObject object) throws CryptographyException, IOException
+ private void decryptObject(COSObject object) throws IOException
{
long objNum = object.getObjectNumber().intValue();
long genNum = object.getGenerationNumber().intValue();
@@ -339,10 +330,9 @@ public abstract class SecurityHandler
* @param objNum The object number.
* @param genNum The object generation Number.
*
- * @throws CryptographyException If there is an error decrypting the stream.
* @throws IOException If there is an error getting the stream data.
*/
- private void decrypt(COSBase obj, long objNum, long genNum) throws CryptographyException, IOException
+ private void decrypt(COSBase obj, long objNum, long genNum) throws IOException
{
if (!objects.contains(obj))
{
@@ -374,10 +364,9 @@ public abstract class SecurityHandler
* @param objNum The object number.
* @param genNum The object generation number.
*
- * @throws CryptographyException If there is an error getting the stream.
* @throws IOException If there is an error getting the stream data.
*/
- public void decryptStream(COSStream stream, long objNum, long genNum) throws CryptographyException, IOException
+ public void decryptStream(COSStream stream, long objNum, long genNum) throws IOException
{
decryptDictionary(stream, objNum, genNum);
InputStream encryptedStream = stream.getFilteredStream();
@@ -393,10 +382,9 @@ public abstract class SecurityHandler
* @param objNum The object number.
* @param genNum The object generation number.
*
- * @throws CryptographyException If there is an error getting the stream.
* @throws IOException If there is an error getting the stream data.
*/
- public void encryptStream(COSStream stream, long objNum, long genNum) throws CryptographyException, IOException
+ public void encryptStream(COSStream stream, long objNum, long genNum) throws IOException
{
InputStream encryptedStream = stream.getFilteredStream();
encryptData(objNum, genNum, encryptedStream, stream.createFilteredStream(), false /* encrypt */);
@@ -409,11 +397,9 @@ public abstract class SecurityHandler
* @param objNum The object number.
* @param genNum The object generation number.
*
- * @throws CryptographyException If there is an error decrypting the document.
* @throws IOException If there is an error creating a new string.
*/
- private void decryptDictionary(COSDictionary dictionary, long objNum, long genNum) throws CryptographyException,
- IOException
+ private void decryptDictionary(COSDictionary dictionary, long objNum, long genNum) throws IOException
{
for (Map.Entry<COSName, COSBase> entry : dictionary.entrySet())
{
@@ -439,10 +425,9 @@ public abstract class SecurityHandler
* @param objNum The object number.
* @param genNum The object generation number.
*
- * @throws CryptographyException If an error occurs during decryption.
* @throws IOException If an error occurs writing the new string.
*/
- public void decryptString(COSString string, long objNum, long genNum) throws CryptographyException, IOException
+ public void decryptString(COSString string, long objNum, long genNum) throws IOException
{
ByteArrayInputStream data = new ByteArrayInputStream(string.getBytes());
ByteArrayOutputStream buffer = new ByteArrayOutputStream();
@@ -458,10 +443,9 @@ public abstract class SecurityHandler
* @param objNum The object number.
* @param genNum The object generation number.
*
- * @throws CryptographyException If an error occurs during decryption.
* @throws IOException If there is an error accessing the data.
*/
- private void decryptArray(COSArray array, long objNum, long genNum) throws CryptographyException, IOException
+ private void decryptArray(COSArray array, long objNum, long genNum) throws IOException
{
for (int i = 0; i < array.size(); i++)
{