You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ms...@apache.org on 2015/03/30 07:51:24 UTC

svn commit: r1669997 [27/49] - in /pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs: ./ org/apache/pdfbox/contentstream/ org/apache/pdfbox/contentstream/class-use/ org/apache/pdfbox/contentstream/operator/ org/apache/pdfbox/contentstream/opera...

Modified: pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.html
URL: http://svn.apache.org/viewvc/pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.html?rev=1669997&r1=1669996&r2=1669997&view=diff
==============================================================================
--- pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.html (original)
+++ pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.html Mon Mar 30 05:51:10 2015
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (version 1.7.0_55) on Sun Jan 04 20:50:35 CET 2015 -->
+<!-- Generated by javadoc (version 1.7.0_55) on Mon Mar 30 07:21:57 CEST 2015 -->
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
 <title>PublicKeySecurityHandler (Apache PDFBox 2.0.0-SNAPSHOT API)</title>
-<meta name="date" content="2015-01-04">
+<meta name="date" content="2015-03-30">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 </head>
 <body>
@@ -180,18 +180,11 @@ extends <a href="../../../../../org/apac
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><strong><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.html#decryptDocument(org.apache.pdfbox.pdmodel.PDDocument, org.apache.pdfbox.pdmodel.encryption.DecryptionMaterial)">decryptDocument</a></strong>(<a href="../../../../../org/apache/pdfbox/pdmodel/PDDocument.html" title="class in org.apache.pdfbox.pdmodel">PDDocument</a>&nbsp;doc,
-               <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/DecryptionMaterial.html" title="class in org.apache.pdfbox.pdmodel.encryption">DecryptionMaterial</a>&nbsp;decryptionMaterial)</code>
-<div class="block">Decrypt the document.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.html#prepareDocumentForEncryption(org.apache.pdfbox.pdmodel.PDDocument)">prepareDocumentForEncryption</a></strong>(<a href="../../../../../org/apache/pdfbox/pdmodel/PDDocument.html" title="class in org.apache.pdfbox.pdmodel">PDDocument</a>&nbsp;doc)</code>
 <div class="block">Prepare the document for encryption.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.html#prepareForDecryption(org.apache.pdfbox.pdmodel.encryption.PDEncryption, org.apache.pdfbox.cos.COSArray, org.apache.pdfbox.pdmodel.encryption.DecryptionMaterial)">prepareForDecryption</a></strong>(<a href="../../../../../org/apache/pdfbox/pdmodel/encryption/PDEncryption.html" title="class in org.apache.pdfbox.pdmodel.encryption">PDEncryption</a>&nbsp;encryption,
                     <a href="../../../../../org/apache/pdfbox/cos/COSArray.html" title="class in org.apache.pdfbox.cos">COSArray</a>&nbsp;documentIDArray,
@@ -205,7 +198,7 @@ extends <a href="../../../../../org/apac
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.pdfbox.pdmodel.encryption.<a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html" title="class in org.apache.pdfbox.pdmodel.encryption">SecurityHandler</a></h3>
-<code><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#decryptArray(org.apache.pdfbox.cos.COSArray, long, long)">decryptArray</a>, <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#decryptStream(org.apache.pdfbox.cos.COSStream, long, long)">decryptStream</a>, <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#decryptString(org.apache.pdfbox.cos.COSString, long, long)">decryptString</a>, <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#encryptData(long, long, java.io.InputStream, java.io.OutputStream)">encryptData</a>, <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#encryptData(long, long, java.io.InputStream, java.io.OutputStream, boolean)">encryptData</a>, <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#encryptStream(org.apache.pdfbox.cos.COSStream, long, long)">encryptStream</a>, <a href
 ="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#encryptString(org.apache.pdfbox.cos.COSString, long, long)">encryptString</a>, <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#getCurrentAccessPermission()">getCurrentAccessPermission</a>, <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#getKeyLength()">getKeyLength</a>, <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#isAES()">isAES</a>, <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#proceedDecryption()">proceedDecryption</a>, <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#setAES(boolean)">setAES</a>, <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#setKeyLength(int)">setKeyLength</a></code></li>
+<code><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#decrypt(org.apache.pdfbox.cos.COSBase, long, long)">decrypt</a>, <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#decryptStream(org.apache.pdfbox.cos.COSStream, long, long)">decryptStream</a>, <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#encryptStream(org.apache.pdfbox.cos.COSStream, long, int)">encryptStream</a>, <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#encryptString(org.apache.pdfbox.cos.COSString, long, int)">encryptString</a>, <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#getCurrentAccessPermission()">getCurrentAccessPermission</a>, <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#getKeyLength()">getKeyLength</a>, <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#isAES()">isAES</a>, <
 a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#setAES(boolean)">setAES</a>, <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#setKeyLength(int)">setKeyLength</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
@@ -276,24 +269,6 @@ extends <a href="../../../../../org/apac
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="decryptDocument(org.apache.pdfbox.pdmodel.PDDocument, org.apache.pdfbox.pdmodel.encryption.DecryptionMaterial)">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>decryptDocument</h4>
-<pre>public&nbsp;void&nbsp;decryptDocument(<a href="../../../../../org/apache/pdfbox/pdmodel/PDDocument.html" title="class in org.apache.pdfbox.pdmodel">PDDocument</a>&nbsp;doc,
-                   <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/DecryptionMaterial.html" title="class in org.apache.pdfbox.pdmodel.encryption">DecryptionMaterial</a>&nbsp;decryptionMaterial)
-                     throws <a href="http://download.oracle.com/javase/1.6.0/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
-<div class="block">Decrypt the document.</div>
-<dl>
-<dt><strong>Specified by:</strong></dt>
-<dd><code><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#decryptDocument(org.apache.pdfbox.pdmodel.PDDocument, org.apache.pdfbox.pdmodel.encryption.DecryptionMaterial)">decryptDocument</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html" title="class in org.apache.pdfbox.pdmodel.encryption">SecurityHandler</a></code></dd>
-<dt><span class="strong">Parameters:</span></dt><dd><code>doc</code> - The document to decrypt.</dd><dd><code>decryptionMaterial</code> - The data used to decrypt the document.</dd>
-<dt><span class="strong">Throws:</span></dt>
-<dd><code><a href="http://download.oracle.com/javase/1.6.0/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code> - If there is an error accessing data.</dd></dl>
-</li>
-</ul>
 <a name="prepareForDecryption(org.apache.pdfbox.pdmodel.encryption.PDEncryption, org.apache.pdfbox.cos.COSArray, org.apache.pdfbox.pdmodel.encryption.DecryptionMaterial)">
 <!--   -->
 </a>
@@ -304,11 +279,7 @@ extends <a href="../../../../../org/apac
                         <a href="../../../../../org/apache/pdfbox/cos/COSArray.html" title="class in org.apache.pdfbox.cos">COSArray</a>&nbsp;documentIDArray,
                         <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/DecryptionMaterial.html" title="class in org.apache.pdfbox.pdmodel.encryption">DecryptionMaterial</a>&nbsp;decryptionMaterial)
                           throws <a href="http://download.oracle.com/javase/1.6.0/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
-<div class="block">Prepares everything to decrypt the document.
-
- If <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.html#decryptDocument(org.apache.pdfbox.pdmodel.PDDocument, org.apache.pdfbox.pdmodel.encryption.DecryptionMaterial)"><code>decryptDocument(PDDocument, DecryptionMaterial)</code></a> is used, this
- method is called from there. Only if decryption of single objects is
- needed this should be called instead.</div>
+<div class="block">Prepares everything to decrypt the document.</div>
 <dl>
 <dt><strong>Specified by:</strong></dt>
 <dd><code><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#prepareForDecryption(org.apache.pdfbox.pdmodel.encryption.PDEncryption, org.apache.pdfbox.cos.COSArray, org.apache.pdfbox.pdmodel.encryption.DecryptionMaterial)">prepareForDecryption</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html" title="class in org.apache.pdfbox.pdmodel.encryption">SecurityHandler</a></code></dd>
@@ -318,7 +289,7 @@ extends <a href="../../../../../org/apac
  this handler)</dd><dd><code>decryptionMaterial</code> - Information used to decrypt the document.</dd>
 <dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="http://download.oracle.com/javase/1.6.0/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code> - If there is an error accessing data. If verbose mode
- is enabled, the exception message will provide more details why the the
+ is enabled, the exception message will provide more details why the
  match wasn't successful.</dd></dl>
 </li>
 </ul>

Modified: pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html
URL: http://svn.apache.org/viewvc/pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html?rev=1669997&r1=1669996&r2=1669997&view=diff
==============================================================================
--- pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html (original)
+++ pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html Mon Mar 30 05:51:10 2015
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (version 1.7.0_55) on Sun Jan 04 20:50:35 CET 2015 -->
+<!-- Generated by javadoc (version 1.7.0_55) on Mon Mar 30 07:21:57 CEST 2015 -->
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
 <title>SecurityHandler (Apache PDFBox 2.0.0-SNAPSHOT API)</title>
-<meta name="date" content="2015-01-04">
+<meta name="date" content="2015-03-30">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 </head>
 <body>
@@ -134,7 +134,7 @@ extends <a href="http://download.oracle.
 <tr class="rowColor">
 <td class="colFirst"><code>protected boolean</code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#decryptMetadata">decryptMetadata</a></strong></code>
-<div class="block">indicates if the Metadata have to be decrypted of not</div>
+<div class="block">indicates if the Metadata have to be decrypted of not.</div>
 </td>
 </tr>
 <tr class="altColor">
@@ -201,20 +201,13 @@ extends <a href="http://download.oracle.
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><strong><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#decryptArray(org.apache.pdfbox.cos.COSArray, long, long)">decryptArray</a></strong>(<a href="../../../../../org/apache/pdfbox/cos/COSArray.html" title="class in org.apache.pdfbox.cos">COSArray</a>&nbsp;array,
-            long&nbsp;objNum,
-            long&nbsp;genNum)</code>
-<div class="block">This will decrypt an array.</div>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#decrypt(org.apache.pdfbox.cos.COSBase, long, long)">decrypt</a></strong>(<a href="../../../../../org/apache/pdfbox/cos/COSBase.html" title="class in org.apache.pdfbox.cos">COSBase</a>&nbsp;obj,
+       long&nbsp;objNum,
+       long&nbsp;genNum)</code>
+<div class="block">This will dispatch to the correct method.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>abstract void</code></td>
-<td class="colLast"><code><strong><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#decryptDocument(org.apache.pdfbox.pdmodel.PDDocument, org.apache.pdfbox.pdmodel.encryption.DecryptionMaterial)">decryptDocument</a></strong>(<a href="../../../../../org/apache/pdfbox/pdmodel/PDDocument.html" title="class in org.apache.pdfbox.pdmodel">PDDocument</a>&nbsp;doc,
-               <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/DecryptionMaterial.html" title="class in org.apache.pdfbox.pdmodel.encryption">DecryptionMaterial</a>&nbsp;mat)</code>
-<div class="block">Prepare the document for decryption.</div>
-</td>
-</tr>
-<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#decryptStream(org.apache.pdfbox.cos.COSStream, long, long)">decryptStream</a></strong>(<a href="../../../../../org/apache/pdfbox/cos/COSStream.html" title="class in org.apache.pdfbox.cos">COSStream</a>&nbsp;stream,
              long&nbsp;objNum,
@@ -222,43 +215,11 @@ extends <a href="http://download.oracle.
 <div class="block">This will decrypt a stream.</div>
 </td>
 </tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><strong><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#decryptString(org.apache.pdfbox.cos.COSString, long, long)">decryptString</a></strong>(<a href="../../../../../org/apache/pdfbox/cos/COSString.html" title="class in org.apache.pdfbox.cos">COSString</a>&nbsp;string,
-             long&nbsp;objNum,
-             long&nbsp;genNum)</code>
-<div class="block">This will decrypt a string.</div>
-</td>
-</tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><strong><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#encryptData(long, long, java.io.InputStream, java.io.OutputStream)">encryptData</a></strong>(long&nbsp;objectNumber,
-           long&nbsp;genNumber,
-           <a href="http://download.oracle.com/javase/1.6.0/docs/api/java/io/InputStream.html?is-external=true" title="class or interface in java.io">InputStream</a>&nbsp;data,
-           <a href="http://download.oracle.com/javase/1.6.0/docs/api/java/io/OutputStream.html?is-external=true" title="class or interface in java.io">OutputStream</a>&nbsp;output)</code>
-<div class="block"><strong>Deprecated.</strong>&nbsp;
-<div class="block"><i>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.</i></div>
-</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><strong><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#encryptData(long, long, java.io.InputStream, java.io.OutputStream, boolean)">encryptData</a></strong>(long&nbsp;objectNumber,
-           long&nbsp;genNumber,
-           <a href="http://download.oracle.com/javase/1.6.0/docs/api/java/io/InputStream.html?is-external=true" title="class or interface in java.io">InputStream</a>&nbsp;data,
-           <a href="http://download.oracle.com/javase/1.6.0/docs/api/java/io/OutputStream.html?is-external=true" title="class or interface in java.io">OutputStream</a>&nbsp;output,
-           boolean&nbsp;decrypt)</code>
-<div class="block">Encrypt a set of data.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><strong><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#encryptStream(org.apache.pdfbox.cos.COSStream, long, long)">encryptStream</a></strong>(<a href="../../../../../org/apache/pdfbox/cos/COSStream.html" title="class in org.apache.pdfbox.cos">COSStream</a>&nbsp;stream,
+<td class="colLast"><code><strong><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#encryptStream(org.apache.pdfbox.cos.COSStream, long, int)">encryptStream</a></strong>(<a href="../../../../../org/apache/pdfbox/cos/COSStream.html" title="class in org.apache.pdfbox.cos">COSStream</a>&nbsp;stream,
              long&nbsp;objNum,
-             long&nbsp;genNum)</code>
+             int&nbsp;genNum)</code>
 <div class="block">This will encrypt a stream, but not the dictionary as the dictionary is
  encrypted by visitFromString() in COSWriter and we don't want to encrypt
  it twice.</div>
@@ -266,9 +227,9 @@ extends <a href="http://download.oracle.
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><strong><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#encryptString(org.apache.pdfbox.cos.COSString, long, long)">encryptString</a></strong>(<a href="../../../../../org/apache/pdfbox/cos/COSString.html" title="class in org.apache.pdfbox.cos">COSString</a>&nbsp;string,
+<td class="colLast"><code><strong><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#encryptString(org.apache.pdfbox.cos.COSString, long, int)">encryptString</a></strong>(<a href="../../../../../org/apache/pdfbox/cos/COSString.html" title="class in org.apache.pdfbox.cos">COSString</a>&nbsp;string,
              long&nbsp;objNum,
-             long&nbsp;genNum)</code>
+             int&nbsp;genNum)</code>
 <div class="block">This will encrypt a string.</div>
 </td>
 </tr>
@@ -305,19 +266,12 @@ extends <a href="http://download.oracle.
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><code><strong><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#proceedDecryption()">proceedDecryption</a></strong>()</code>
-<div class="block">This method must be called by an implementation of this class to really proceed
- to decryption.</div>
-</td>
-</tr>
-<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#setAES(boolean)">setAES</a></strong>(boolean&nbsp;aesValue)</code>
 <div class="block">Set to true if AES for encryption and decryption should be used.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#setKeyLength(int)">setKeyLength</a></strong>(int&nbsp;keyLen)</code>
 <div class="block">Setter of the property <tt>keyLength</tt>.</div>
@@ -402,7 +356,7 @@ extends <a href="http://download.oracle.
 <li class="blockList">
 <h4>decryptMetadata</h4>
 <pre>protected&nbsp;boolean decryptMetadata</pre>
-<div class="block">indicates if the Metadata have to be decrypted of not</div>
+<div class="block">indicates if the Metadata have to be decrypted of not.</div>
 </li>
 </ul>
 <a name="currentAccessPermission">
@@ -465,81 +419,26 @@ extends <a href="http://download.oracle.
                         <a href="../../../../../org/apache/pdfbox/cos/COSArray.html" title="class in org.apache.pdfbox.cos">COSArray</a>&nbsp;documentIDArray,
                         <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/DecryptionMaterial.html" title="class in org.apache.pdfbox.pdmodel.encryption">DecryptionMaterial</a>&nbsp;decryptionMaterial)
                                    throws <a href="http://download.oracle.com/javase/1.6.0/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
-<div class="block">Prepares everything to decrypt the document.
- 
- If <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#decryptDocument(org.apache.pdfbox.pdmodel.PDDocument, org.apache.pdfbox.pdmodel.encryption.DecryptionMaterial)"><code>decryptDocument(PDDocument, DecryptionMaterial)</code></a> is used, this method is
- called from there. Only if decryption of single objects is needed this should be called instead.</div>
+<div class="block">Prepares everything to decrypt the document.</div>
 <dl><dt><span class="strong">Parameters:</span></dt><dd><code>encryption</code> - encryption dictionary, can be retrieved via <a href="../../../../../org/apache/pdfbox/pdmodel/PDDocument.html#getEncryption()"><code>PDDocument.getEncryption()</code></a></dd><dd><code>documentIDArray</code> - document id which is returned via <a href="../../../../../org/apache/pdfbox/cos/COSDocument.html#getDocumentID()"><code>COSDocument.getDocumentID()</code></a></dd><dd><code>decryptionMaterial</code> - Information used to decrypt the document.</dd>
 <dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="http://download.oracle.com/javase/1.6.0/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code> - If there is an error accessing data.</dd></dl>
 </li>
 </ul>
-<a name="decryptDocument(org.apache.pdfbox.pdmodel.PDDocument, org.apache.pdfbox.pdmodel.encryption.DecryptionMaterial)">
+<a name="decrypt(org.apache.pdfbox.cos.COSBase, long, long)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>decryptDocument</h4>
-<pre>public abstract&nbsp;void&nbsp;decryptDocument(<a href="../../../../../org/apache/pdfbox/pdmodel/PDDocument.html" title="class in org.apache.pdfbox.pdmodel">PDDocument</a>&nbsp;doc,
-                   <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/DecryptionMaterial.html" title="class in org.apache.pdfbox.pdmodel.encryption">DecryptionMaterial</a>&nbsp;mat)
-                              throws <a href="http://download.oracle.com/javase/1.6.0/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
-<div class="block">Prepare the document for decryption.</div>
-<dl><dt><span class="strong">Parameters:</span></dt><dd><code>doc</code> - The document to decrypt.</dd><dd><code>mat</code> - Information required to decrypt the document.</dd>
+<h4>decrypt</h4>
+<pre>public&nbsp;void&nbsp;decrypt(<a href="../../../../../org/apache/pdfbox/cos/COSBase.html" title="class in org.apache.pdfbox.cos">COSBase</a>&nbsp;obj,
+           long&nbsp;objNum,
+           long&nbsp;genNum)
+             throws <a href="http://download.oracle.com/javase/1.6.0/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
+<div class="block">This will dispatch to the correct method.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>obj</code> - The object to decrypt.</dd><dd><code>objNum</code> - The object number.</dd><dd><code>genNum</code> - The object generation Number.</dd>
 <dt><span class="strong">Throws:</span></dt>
-<dd><code><a href="http://download.oracle.com/javase/1.6.0/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code> - If there is an error with the document.</dd></dl>
-</li>
-</ul>
-<a name="proceedDecryption()">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>proceedDecryption</h4>
-<pre>protected&nbsp;void&nbsp;proceedDecryption()
-                          throws <a href="http://download.oracle.com/javase/1.6.0/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
-<div class="block">This method must be called by an implementation of this class to really proceed
- to decryption.</div>
-<dl><dt><span class="strong">Throws:</span></dt>
-<dd><code><a href="http://download.oracle.com/javase/1.6.0/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code> - If there is an error in the decryption.</dd></dl>
-</li>
-</ul>
-<a name="encryptData(long, long, java.io.InputStream, java.io.OutputStream)">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>encryptData</h4>
-<pre>public&nbsp;void&nbsp;encryptData(long&nbsp;objectNumber,
-               long&nbsp;genNumber,
-               <a href="http://download.oracle.com/javase/1.6.0/docs/api/java/io/InputStream.html?is-external=true" title="class or interface in java.io">InputStream</a>&nbsp;data,
-               <a href="http://download.oracle.com/javase/1.6.0/docs/api/java/io/OutputStream.html?is-external=true" title="class or interface in java.io">OutputStream</a>&nbsp;output)
-                 throws <a href="http://download.oracle.com/javase/1.6.0/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
-<div class="block"><span class="strong">Deprecated.</span>&nbsp;<i>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.</i></div>
-<div class="block">Encrypt a set of data.</div>
-<dl><dt><span class="strong">Parameters:</span></dt><dd><code>objectNumber</code> - The data object number.</dd><dd><code>genNumber</code> - The data generation number.</dd><dd><code>data</code> - The data to encrypt.</dd><dd><code>output</code> - The output to write the encrypted data to.</dd>
-<dt><span class="strong">Throws:</span></dt>
-<dd><code><a href="http://download.oracle.com/javase/1.6.0/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code> - If there is an error reading the data.</dd></dl>
-</li>
-</ul>
-<a name="encryptData(long, long, java.io.InputStream, java.io.OutputStream, boolean)">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>encryptData</h4>
-<pre>public&nbsp;void&nbsp;encryptData(long&nbsp;objectNumber,
-               long&nbsp;genNumber,
-               <a href="http://download.oracle.com/javase/1.6.0/docs/api/java/io/InputStream.html?is-external=true" title="class or interface in java.io">InputStream</a>&nbsp;data,
-               <a href="http://download.oracle.com/javase/1.6.0/docs/api/java/io/OutputStream.html?is-external=true" title="class or interface in java.io">OutputStream</a>&nbsp;output,
-               boolean&nbsp;decrypt)
-                 throws <a href="http://download.oracle.com/javase/1.6.0/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
-<div class="block">Encrypt a set of data.</div>
-<dl><dt><span class="strong">Parameters:</span></dt><dd><code>objectNumber</code> - The data object number.</dd><dd><code>genNumber</code> - The data generation number.</dd><dd><code>data</code> - The data to encrypt.</dd><dd><code>output</code> - The output to write the encrypted data to.</dd><dd><code>decrypt</code> - true to decrypt the data, false to encrypt it</dd>
-<dt><span class="strong">Throws:</span></dt>
-<dd><code><a href="http://download.oracle.com/javase/1.6.0/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code> - If there is an error reading the data.</dd></dl>
+<dd><code><a href="http://download.oracle.com/javase/1.6.0/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code> - If there is an error getting the stream data.</dd></dl>
 </li>
 </ul>
 <a name="decryptStream(org.apache.pdfbox.cos.COSStream, long, long)">
@@ -558,7 +457,7 @@ extends <a href="http://download.oracle.
 <dd><code><a href="http://download.oracle.com/javase/1.6.0/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code> - If there is an error getting the stream data.</dd></dl>
 </li>
 </ul>
-<a name="encryptStream(org.apache.pdfbox.cos.COSStream, long, long)">
+<a name="encryptStream(org.apache.pdfbox.cos.COSStream, long, int)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -566,7 +465,7 @@ extends <a href="http://download.oracle.
 <h4>encryptStream</h4>
 <pre>public&nbsp;void&nbsp;encryptStream(<a href="../../../../../org/apache/pdfbox/cos/COSStream.html" title="class in org.apache.pdfbox.cos">COSStream</a>&nbsp;stream,
                  long&nbsp;objNum,
-                 long&nbsp;genNum)
+                 int&nbsp;genNum)
                    throws <a href="http://download.oracle.com/javase/1.6.0/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">This will encrypt a stream, but not the dictionary as the dictionary is
  encrypted by visitFromString() in COSWriter and we don't want to encrypt
@@ -576,23 +475,7 @@ extends <a href="http://download.oracle.
 <dd><code><a href="http://download.oracle.com/javase/1.6.0/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code> - If there is an error getting the stream data.</dd></dl>
 </li>
 </ul>
-<a name="decryptString(org.apache.pdfbox.cos.COSString, long, long)">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>decryptString</h4>
-<pre>public&nbsp;void&nbsp;decryptString(<a href="../../../../../org/apache/pdfbox/cos/COSString.html" title="class in org.apache.pdfbox.cos">COSString</a>&nbsp;string,
-                 long&nbsp;objNum,
-                 long&nbsp;genNum)
-                   throws <a href="http://download.oracle.com/javase/1.6.0/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
-<div class="block">This will decrypt a string.</div>
-<dl><dt><span class="strong">Parameters:</span></dt><dd><code>string</code> - the string to decrypt.</dd><dd><code>objNum</code> - The object number.</dd><dd><code>genNum</code> - The object generation number.</dd>
-<dt><span class="strong">Throws:</span></dt>
-<dd><code><a href="http://download.oracle.com/javase/1.6.0/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code> - If an error occurs writing the new string.</dd></dl>
-</li>
-</ul>
-<a name="encryptString(org.apache.pdfbox.cos.COSString, long, long)">
+<a name="encryptString(org.apache.pdfbox.cos.COSString, long, int)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -600,7 +483,7 @@ extends <a href="http://download.oracle.
 <h4>encryptString</h4>
 <pre>public&nbsp;void&nbsp;encryptString(<a href="../../../../../org/apache/pdfbox/cos/COSString.html" title="class in org.apache.pdfbox.cos">COSString</a>&nbsp;string,
                  long&nbsp;objNum,
-                 long&nbsp;genNum)
+                 int&nbsp;genNum)
                    throws <a href="http://download.oracle.com/javase/1.6.0/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">This will encrypt a string.</div>
 <dl><dt><span class="strong">Parameters:</span></dt><dd><code>string</code> - the string to encrypt.</dd><dd><code>objNum</code> - The object number.</dd><dd><code>genNum</code> - The object generation number.</dd>
@@ -608,22 +491,6 @@ extends <a href="http://download.oracle.
 <dd><code><a href="http://download.oracle.com/javase/1.6.0/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code> - If an error occurs writing the new string.</dd></dl>
 </li>
 </ul>
-<a name="decryptArray(org.apache.pdfbox.cos.COSArray, long, long)">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>decryptArray</h4>
-<pre>public&nbsp;void&nbsp;decryptArray(<a href="../../../../../org/apache/pdfbox/cos/COSArray.html" title="class in org.apache.pdfbox.cos">COSArray</a>&nbsp;array,
-                long&nbsp;objNum,
-                long&nbsp;genNum)
-                  throws <a href="http://download.oracle.com/javase/1.6.0/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
-<div class="block">This will decrypt an array.</div>
-<dl><dt><span class="strong">Parameters:</span></dt><dd><code>array</code> - The array to decrypt.</dd><dd><code>objNum</code> - The object number.</dd><dd><code>genNum</code> - The object generation number.</dd>
-<dt><span class="strong">Throws:</span></dt>
-<dd><code><a href="http://download.oracle.com/javase/1.6.0/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code> - If there is an error accessing the data.</dd></dl>
-</li>
-</ul>
 <a name="getKeyLength()">
 <!--   -->
 </a>

Modified: pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/SecurityHandlerFactory.html
URL: http://svn.apache.org/viewvc/pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/SecurityHandlerFactory.html?rev=1669997&r1=1669996&r2=1669997&view=diff
==============================================================================
--- pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/SecurityHandlerFactory.html (original)
+++ pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/SecurityHandlerFactory.html Mon Mar 30 05:51:10 2015
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (version 1.7.0_55) on Sun Jan 04 20:50:35 CET 2015 -->
+<!-- Generated by javadoc (version 1.7.0_55) on Mon Mar 30 07:21:57 CEST 2015 -->
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
 <title>SecurityHandlerFactory (Apache PDFBox 2.0.0-SNAPSHOT API)</title>
-<meta name="date" content="2015-01-04">
+<meta name="date" content="2015-03-30">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 </head>
 <body>
@@ -192,7 +192,7 @@ extends <a href="http://download.oracle.
 <ul class="blockListLast">
 <li class="blockList">
 <h4>INSTANCE</h4>
-<pre>public static&nbsp;<a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandlerFactory.html" title="class in org.apache.pdfbox.pdmodel.encryption">SecurityHandlerFactory</a> INSTANCE</pre>
+<pre>public static final&nbsp;<a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandlerFactory.html" title="class in org.apache.pdfbox.pdmodel.encryption">SecurityHandlerFactory</a> INSTANCE</pre>
 <div class="block">Singleton instance</div>
 </li>
 </ul>

Modified: pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/StandardDecryptionMaterial.html
URL: http://svn.apache.org/viewvc/pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/StandardDecryptionMaterial.html?rev=1669997&r1=1669996&r2=1669997&view=diff
==============================================================================
--- pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/StandardDecryptionMaterial.html (original)
+++ pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/StandardDecryptionMaterial.html Mon Mar 30 05:51:10 2015
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (version 1.7.0_55) on Sun Jan 04 20:50:35 CET 2015 -->
+<!-- Generated by javadoc (version 1.7.0_55) on Mon Mar 30 07:21:57 CEST 2015 -->
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
 <title>StandardDecryptionMaterial (Apache PDFBox 2.0.0-SNAPSHOT API)</title>
-<meta name="date" content="2015-01-04">
+<meta name="date" content="2015-03-30">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 </head>
 <body>
@@ -117,10 +117,8 @@ extends <a href="../../../../../org/apac
   StandardDecryptionMaterial dm = new StandardDecryptionMaterial("password");
   doc.openProtection(dm);
   </pre></div>
-<dl><dt><span class="strong">Version:</span></dt>
-  <dd>$Revision: 1.2 $</dd>
-<dt><span class="strong">Author:</span></dt>
-  <dd>Benoit Guillon (benoit.guillon@snv.jussieu.fr)</dd></dl>
+<dl><dt><span class="strong">Author:</span></dt>
+  <dd>Benoit Guillon</dd></dl>
 </li>
 </ul>
 </div>

Modified: pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/StandardProtectionPolicy.html
URL: http://svn.apache.org/viewvc/pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/StandardProtectionPolicy.html?rev=1669997&r1=1669996&r2=1669997&view=diff
==============================================================================
--- pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/StandardProtectionPolicy.html (original)
+++ pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/StandardProtectionPolicy.html Mon Mar 30 05:51:10 2015
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (version 1.7.0_55) on Sun Jan 04 20:50:35 CET 2015 -->
+<!-- Generated by javadoc (version 1.7.0_55) on Mon Mar 30 07:21:57 CEST 2015 -->
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
 <title>StandardProtectionPolicy (Apache PDFBox 2.0.0-SNAPSHOT API)</title>
-<meta name="date" content="2015-01-04">
+<meta name="date" content="2015-03-30">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 </head>
 <body>

Modified: pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/StandardSecurityHandler.html
URL: http://svn.apache.org/viewvc/pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/StandardSecurityHandler.html?rev=1669997&r1=1669996&r2=1669997&view=diff
==============================================================================
--- pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/StandardSecurityHandler.html (original)
+++ pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/StandardSecurityHandler.html Mon Mar 30 05:51:10 2015
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (version 1.7.0_55) on Sun Jan 04 20:50:35 CET 2015 -->
+<!-- Generated by javadoc (version 1.7.0_55) on Mon Mar 30 07:21:57 CEST 2015 -->
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
 <title>StandardSecurityHandler (Apache PDFBox 2.0.0-SNAPSHOT API)</title>
-<meta name="date" content="2015-01-04">
+<meta name="date" content="2015-03-30">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 </head>
 <body>
@@ -127,18 +127,12 @@ extends <a href="../../../../../org/apac
 <th class="colLast" scope="col">Field and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>static byte[]</code></td>
-<td class="colLast"><code><strong><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/StandardSecurityHandler.html#ENCRYPT_PADDING">ENCRYPT_PADDING</a></strong></code>
-<div class="block">Standard padding for encryption.</div>
-</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><code>static <a href="http://download.oracle.com/javase/1.6.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/StandardSecurityHandler.html#FILTER">FILTER</a></strong></code>
 <div class="block">Type of security handler.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static <a href="http://download.oracle.com/javase/1.6.0/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;</code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/StandardSecurityHandler.html#PROTECTION_POLICY_CLASS">PROTECTION_POLICY_CLASS</a></strong></code>
 <div class="block">Protection policy class for this handler.</div>
@@ -228,13 +222,6 @@ extends <a href="../../../../../org/apac
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><strong><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/StandardSecurityHandler.html#decryptDocument(org.apache.pdfbox.pdmodel.PDDocument, org.apache.pdfbox.pdmodel.encryption.DecryptionMaterial)">decryptDocument</a></strong>(<a href="../../../../../org/apache/pdfbox/pdmodel/PDDocument.html" title="class in org.apache.pdfbox.pdmodel">PDDocument</a>&nbsp;doc,
-               <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/DecryptionMaterial.html" title="class in org.apache.pdfbox.pdmodel.encryption">DecryptionMaterial</a>&nbsp;decryptionMaterial)</code>
-<div class="block">Decrypt the document.</div>
-</td>
-</tr>
-<tr class="altColor">
 <td class="colFirst"><code>byte[]</code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/StandardSecurityHandler.html#getUserPassword(byte[], byte[], int, int)">getUserPassword</a></strong>(byte[]&nbsp;ownerPassword,
                byte[]&nbsp;owner,
@@ -243,7 +230,7 @@ extends <a href="../../../../../org/apac
 <div class="block">Get the user password based on the owner password.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/StandardSecurityHandler.html#isOwnerPassword(byte[], byte[], byte[], int, byte[], int, int, boolean)">isOwnerPassword</a></strong>(byte[]&nbsp;ownerPassword,
                byte[]&nbsp;user,
@@ -256,7 +243,7 @@ extends <a href="../../../../../org/apac
 <div class="block">Check for owner password.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/StandardSecurityHandler.html#isOwnerPassword(java.lang.String, byte[], byte[], int, byte[], int, int, boolean)">isOwnerPassword</a></strong>(<a href="http://download.oracle.com/javase/1.6.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;password,
                byte[]&nbsp;user,
@@ -269,7 +256,7 @@ extends <a href="../../../../../org/apac
 <div class="block">Check for owner password.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/StandardSecurityHandler.html#isUserPassword(byte[], byte[], byte[], int, byte[], int, int, boolean)">isUserPassword</a></strong>(byte[]&nbsp;password,
               byte[]&nbsp;user,
@@ -282,7 +269,7 @@ extends <a href="../../../../../org/apac
 <div class="block">Check if a plaintext password is the user password.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/StandardSecurityHandler.html#isUserPassword(java.lang.String, byte[], byte[], int, byte[], int, int, boolean)">isUserPassword</a></strong>(<a href="http://download.oracle.com/javase/1.6.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;password,
               byte[]&nbsp;user,
@@ -295,13 +282,13 @@ extends <a href="../../../../../org/apac
 <div class="block">Check if a plaintext password is the user password.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/StandardSecurityHandler.html#prepareDocumentForEncryption(org.apache.pdfbox.pdmodel.PDDocument)">prepareDocumentForEncryption</a></strong>(<a href="../../../../../org/apache/pdfbox/pdmodel/PDDocument.html" title="class in org.apache.pdfbox.pdmodel">PDDocument</a>&nbsp;doc)</code>
 <div class="block">Prepare document for encryption.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/StandardSecurityHandler.html#prepareForDecryption(org.apache.pdfbox.pdmodel.encryption.PDEncryption, org.apache.pdfbox.cos.COSArray, org.apache.pdfbox.pdmodel.encryption.DecryptionMaterial)">prepareForDecryption</a></strong>(<a href="../../../../../org/apache/pdfbox/pdmodel/encryption/PDEncryption.html" title="class in org.apache.pdfbox.pdmodel.encryption">PDEncryption</a>&nbsp;encryption,
                     <a href="../../../../../org/apache/pdfbox/cos/COSArray.html" title="class in org.apache.pdfbox.cos">COSArray</a>&nbsp;documentIDArray,
@@ -315,7 +302,7 @@ extends <a href="../../../../../org/apac
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.pdfbox.pdmodel.encryption.<a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html" title="class in org.apache.pdfbox.pdmodel.encryption">SecurityHandler</a></h3>
-<code><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#decryptArray(org.apache.pdfbox.cos.COSArray, long, long)">decryptArray</a>, <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#decryptStream(org.apache.pdfbox.cos.COSStream, long, long)">decryptStream</a>, <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#decryptString(org.apache.pdfbox.cos.COSString, long, long)">decryptString</a>, <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#encryptData(long, long, java.io.InputStream, java.io.OutputStream)">encryptData</a>, <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#encryptData(long, long, java.io.InputStream, java.io.OutputStream, boolean)">encryptData</a>, <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#encryptStream(org.apache.pdfbox.cos.COSStream, long, long)">encryptStream</a>, <a href
 ="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#encryptString(org.apache.pdfbox.cos.COSString, long, long)">encryptString</a>, <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#getCurrentAccessPermission()">getCurrentAccessPermission</a>, <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#getKeyLength()">getKeyLength</a>, <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#isAES()">isAES</a>, <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#proceedDecryption()">proceedDecryption</a>, <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#setAES(boolean)">setAES</a>, <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#setKeyLength(int)">setKeyLength</a></code></li>
+<code><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#decrypt(org.apache.pdfbox.cos.COSBase, long, long)">decrypt</a>, <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#decryptStream(org.apache.pdfbox.cos.COSStream, long, long)">decryptStream</a>, <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#encryptStream(org.apache.pdfbox.cos.COSStream, long, int)">encryptStream</a>, <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#encryptString(org.apache.pdfbox.cos.COSString, long, int)">encryptString</a>, <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#getCurrentAccessPermission()">getCurrentAccessPermission</a>, <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#getKeyLength()">getKeyLength</a>, <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#isAES()">isAES</a>, <
 a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#setAES(boolean)">setAES</a>, <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#setKeyLength(int)">setKeyLength</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
@@ -352,23 +339,13 @@ extends <a href="../../../../../org/apac
 <a name="PROTECTION_POLICY_CLASS">
 <!--   -->
 </a>
-<ul class="blockList">
+<ul class="blockListLast">
 <li class="blockList">
 <h4>PROTECTION_POLICY_CLASS</h4>
 <pre>public static final&nbsp;<a href="http://download.oracle.com/javase/1.6.0/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt; PROTECTION_POLICY_CLASS</pre>
 <div class="block">Protection policy class for this handler.</div>
 </li>
 </ul>
-<a name="ENCRYPT_PADDING">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>ENCRYPT_PADDING</h4>
-<pre>public static final&nbsp;byte[] ENCRYPT_PADDING</pre>
-<div class="block">Standard padding for encryption.</div>
-</li>
-</ul>
 </li>
 </ul>
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
@@ -406,24 +383,6 @@ extends <a href="../../../../../org/apac
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="decryptDocument(org.apache.pdfbox.pdmodel.PDDocument, org.apache.pdfbox.pdmodel.encryption.DecryptionMaterial)">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>decryptDocument</h4>
-<pre>public&nbsp;void&nbsp;decryptDocument(<a href="../../../../../org/apache/pdfbox/pdmodel/PDDocument.html" title="class in org.apache.pdfbox.pdmodel">PDDocument</a>&nbsp;doc,
-                   <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/DecryptionMaterial.html" title="class in org.apache.pdfbox.pdmodel.encryption">DecryptionMaterial</a>&nbsp;decryptionMaterial)
-                     throws <a href="http://download.oracle.com/javase/1.6.0/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
-<div class="block">Decrypt the document.</div>
-<dl>
-<dt><strong>Specified by:</strong></dt>
-<dd><code><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#decryptDocument(org.apache.pdfbox.pdmodel.PDDocument, org.apache.pdfbox.pdmodel.encryption.DecryptionMaterial)">decryptDocument</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html" title="class in org.apache.pdfbox.pdmodel.encryption">SecurityHandler</a></code></dd>
-<dt><span class="strong">Parameters:</span></dt><dd><code>doc</code> - The document to be decrypted.</dd><dd><code>decryptionMaterial</code> - Information used to decrypt the document.</dd>
-<dt><span class="strong">Throws:</span></dt>
-<dd><code><a href="http://download.oracle.com/javase/1.6.0/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code> - If there is an error accessing data.</dd></dl>
-</li>
-</ul>
 <a name="prepareForDecryption(org.apache.pdfbox.pdmodel.encryption.PDEncryption, org.apache.pdfbox.cos.COSArray, org.apache.pdfbox.pdmodel.encryption.DecryptionMaterial)">
 <!--   -->
 </a>
@@ -436,8 +395,7 @@ extends <a href="../../../../../org/apac
                           throws <a href="http://download.oracle.com/javase/1.6.0/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Prepares everything to decrypt the document.
 
- Called from <a href="../../../../../org/apache/pdfbox/pdmodel/encryption/StandardSecurityHandler.html#decryptDocument(org.apache.pdfbox.pdmodel.PDDocument, org.apache.pdfbox.pdmodel.encryption.DecryptionMaterial)"><code>decryptDocument(PDDocument, DecryptionMaterial)</code></a>.
- Only if decryption of single objects is needed this should be called instead.</div>
+ Only if decryption of single objects is needed this should be called.</div>
 <dl>
 <dt><strong>Specified by:</strong></dt>
 <dd><code><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#prepareForDecryption(org.apache.pdfbox.pdmodel.encryption.PDEncryption, org.apache.pdfbox.cos.COSArray, org.apache.pdfbox.pdmodel.encryption.DecryptionMaterial)">prepareForDecryption</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html" title="class in org.apache.pdfbox.pdmodel.encryption">SecurityHandler</a></code></dd>
@@ -583,7 +541,7 @@ extends <a href="../../../../../org/apac
                      boolean&nbsp;encryptMetadata)
                        throws <a href="http://download.oracle.com/javase/1.6.0/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Check if a plaintext password is the user password.</div>
-<dl><dt><span class="strong">Parameters:</span></dt><dd><code>password</code> - The plaintext password.</dd><dd><code>user</code> - The u entry of the encryption dictionary.</dd><dd><code>owner</code> - The o entry of the encryption dictionary.</dd><dd><code>permissions</code> - The permissions set in the the PDF.</dd><dd><code>id</code> - The document id used for encryption.</dd><dd><code>encRevision</code> - The revision of the encryption algorithm.</dd><dd><code>length</code> - The length of the encryption key.</dd><dd><code>encryptMetadata</code> - The encryption metadata</dd>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>password</code> - The plaintext password.</dd><dd><code>user</code> - The u entry of the encryption dictionary.</dd><dd><code>owner</code> - The o entry of the encryption dictionary.</dd><dd><code>permissions</code> - The permissions set in the PDF.</dd><dd><code>id</code> - The document id used for encryption.</dd><dd><code>encRevision</code> - The revision of the encryption algorithm.</dd><dd><code>length</code> - The length of the encryption key.</dd><dd><code>encryptMetadata</code> - The encryption metadata</dd>
 <dt><span class="strong">Returns:</span></dt><dd>true If the plaintext password is the user password.</dd>
 <dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="http://download.oracle.com/javase/1.6.0/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code> - If there is an error accessing data.</dd></dl>
@@ -605,7 +563,7 @@ extends <a href="../../../../../org/apac
                      boolean&nbsp;encryptMetadata)
                        throws <a href="http://download.oracle.com/javase/1.6.0/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Check if a plaintext password is the user password.</div>
-<dl><dt><span class="strong">Parameters:</span></dt><dd><code>password</code> - The plaintext password.</dd><dd><code>user</code> - The u entry of the encryption dictionary.</dd><dd><code>owner</code> - The o entry of the encryption dictionary.</dd><dd><code>permissions</code> - The permissions set in the the PDF.</dd><dd><code>id</code> - The document id used for encryption.</dd><dd><code>encRevision</code> - The revision of the encryption algorithm.</dd><dd><code>length</code> - The length of the encryption key.</dd><dd><code>encryptMetadata</code> - The encryption metadata</dd>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>password</code> - The plaintext password.</dd><dd><code>user</code> - The u entry of the encryption dictionary.</dd><dd><code>owner</code> - The o entry of the encryption dictionary.</dd><dd><code>permissions</code> - The permissions set in the PDF.</dd><dd><code>id</code> - The document id used for encryption.</dd><dd><code>encRevision</code> - The revision of the encryption algorithm.</dd><dd><code>length</code> - The length of the encryption key.</dd><dd><code>encryptMetadata</code> - The encryption metadata</dd>
 <dt><span class="strong">Returns:</span></dt><dd>true If the plaintext password is the user password.</dd>
 <dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="http://download.oracle.com/javase/1.6.0/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code> - If there is an error accessing data.</dd></dl>

Modified: pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/AccessPermission.html
URL: http://svn.apache.org/viewvc/pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/AccessPermission.html?rev=1669997&r1=1669996&r2=1669997&view=diff
==============================================================================
--- pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/AccessPermission.html (original)
+++ pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/AccessPermission.html Mon Mar 30 05:51:10 2015
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (version 1.7.0_55) on Sun Jan 04 20:50:39 CET 2015 -->
+<!-- Generated by javadoc (version 1.7.0_55) on Mon Mar 30 07:22:02 CEST 2015 -->
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
 <title>Uses of Class org.apache.pdfbox.pdmodel.encryption.AccessPermission (Apache PDFBox 2.0.0-SNAPSHOT API)</title>
-<meta name="date" content="2015-01-04">
+<meta name="date" content="2015-03-30">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 </head>
 <body>

Modified: pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/DecryptionMaterial.html
URL: http://svn.apache.org/viewvc/pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/DecryptionMaterial.html?rev=1669997&r1=1669996&r2=1669997&view=diff
==============================================================================
--- pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/DecryptionMaterial.html (original)
+++ pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/DecryptionMaterial.html Mon Mar 30 05:51:10 2015
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (version 1.7.0_55) on Sun Jan 04 20:50:39 CET 2015 -->
+<!-- Generated by javadoc (version 1.7.0_55) on Mon Mar 30 07:22:02 CEST 2015 -->
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
 <title>Uses of Class org.apache.pdfbox.pdmodel.encryption.DecryptionMaterial (Apache PDFBox 2.0.0-SNAPSHOT API)</title>
-<meta name="date" content="2015-01-04">
+<meta name="date" content="2015-03-30">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 </head>
 <body>
@@ -77,12 +77,6 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><a href="#org.apache.pdfbox.pdmodel">org.apache.pdfbox.pdmodel</a></td>
-<td class="colLast">
-<div class="block">The PDModel package represents a high level API for creating and manipulating PDF documents.</div>
-</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><a href="#org.apache.pdfbox.pdmodel.encryption">org.apache.pdfbox.pdmodel.encryption</a></td>
 <td class="colLast">
 <div class="block">The encryption package will handle the PDF document security handlers and the functionality of pluggable security handlers.</div>
@@ -93,26 +87,6 @@
 </li>
 <li class="blockList">
 <ul class="blockList">
-<li class="blockList"><a name="org.apache.pdfbox.pdmodel">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../../../../../org/apache/pdfbox/pdmodel/encryption/DecryptionMaterial.html" title="class in org.apache.pdfbox.pdmodel.encryption">DecryptionMaterial</a> in <a href="../../../../../../org/apache/pdfbox/pdmodel/package-summary.html">org.apache.pdfbox.pdmodel</a></h3>
-<table border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../../../../../org/apache/pdfbox/pdmodel/package-summary.html">org.apache.pdfbox.pdmodel</a> with parameters of type <a href="../../../../../../org/apache/pdfbox/pdmodel/encryption/DecryptionMaterial.html" title="class in org.apache.pdfbox.pdmodel.encryption">DecryptionMaterial</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">PDDocument.</span><code><strong><a href="../../../../../../org/apache/pdfbox/pdmodel/PDDocument.html#openProtection(org.apache.pdfbox.pdmodel.encryption.DecryptionMaterial)">openProtection</a></strong>(<a href="../../../../../../org/apache/pdfbox/pdmodel/encryption/DecryptionMaterial.html" title="class in org.apache.pdfbox.pdmodel.encryption">DecryptionMaterial</a>&nbsp;decryptionMaterial)</code>
-<div class="block">Tries to decrypt the document in memory using the provided decryption material.</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
 <li class="blockList"><a name="org.apache.pdfbox.pdmodel.encryption">
 <!--   -->
 </a>
@@ -149,34 +123,13 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">StandardSecurityHandler.</span><code><strong><a href="../../../../../../org/apache/pdfbox/pdmodel/encryption/StandardSecurityHandler.html#decryptDocument(org.apache.pdfbox.pdmodel.PDDocument, org.apache.pdfbox.pdmodel.encryption.DecryptionMaterial)">decryptDocument</a></strong>(<a href="../../../../../../org/apache/pdfbox/pdmodel/PDDocument.html" title="class in org.apache.pdfbox.pdmodel">PDDocument</a>&nbsp;doc,
-               <a href="../../../../../../org/apache/pdfbox/pdmodel/encryption/DecryptionMaterial.html" title="class in org.apache.pdfbox.pdmodel.encryption">DecryptionMaterial</a>&nbsp;decryptionMaterial)</code>
-<div class="block">Decrypt the document.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>abstract void</code></td>
-<td class="colLast"><span class="strong">SecurityHandler.</span><code><strong><a href="../../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#decryptDocument(org.apache.pdfbox.pdmodel.PDDocument, org.apache.pdfbox.pdmodel.encryption.DecryptionMaterial)">decryptDocument</a></strong>(<a href="../../../../../../org/apache/pdfbox/pdmodel/PDDocument.html" title="class in org.apache.pdfbox.pdmodel">PDDocument</a>&nbsp;doc,
-               <a href="../../../../../../org/apache/pdfbox/pdmodel/encryption/DecryptionMaterial.html" title="class in org.apache.pdfbox.pdmodel.encryption">DecryptionMaterial</a>&nbsp;mat)</code>
-<div class="block">Prepare the document for decryption.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">PublicKeySecurityHandler.</span><code><strong><a href="../../../../../../org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.html#decryptDocument(org.apache.pdfbox.pdmodel.PDDocument, org.apache.pdfbox.pdmodel.encryption.DecryptionMaterial)">decryptDocument</a></strong>(<a href="../../../../../../org/apache/pdfbox/pdmodel/PDDocument.html" title="class in org.apache.pdfbox.pdmodel">PDDocument</a>&nbsp;doc,
-               <a href="../../../../../../org/apache/pdfbox/pdmodel/encryption/DecryptionMaterial.html" title="class in org.apache.pdfbox.pdmodel.encryption">DecryptionMaterial</a>&nbsp;decryptionMaterial)</code>
-<div class="block">Decrypt the document.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="strong">StandardSecurityHandler.</span><code><strong><a href="../../../../../../org/apache/pdfbox/pdmodel/encryption/StandardSecurityHandler.html#prepareForDecryption(org.apache.pdfbox.pdmodel.encryption.PDEncryption, org.apache.pdfbox.cos.COSArray, org.apache.pdfbox.pdmodel.encryption.DecryptionMaterial)">prepareForDecryption</a></strong>(<a href="../../../../../../org/apache/pdfbox/pdmodel/encryption/PDEncryption.html" title="class in org.apache.pdfbox.pdmodel.encryption">PDEncryption</a>&nbsp;encryption,
                     <a href="../../../../../../org/apache/pdfbox/cos/COSArray.html" title="class in org.apache.pdfbox.cos">COSArray</a>&nbsp;documentIDArray,
                     <a href="../../../../../../org/apache/pdfbox/pdmodel/encryption/DecryptionMaterial.html" title="class in org.apache.pdfbox.pdmodel.encryption">DecryptionMaterial</a>&nbsp;decryptionMaterial)</code>
 <div class="block">Prepares everything to decrypt the document.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>abstract void</code></td>
 <td class="colLast"><span class="strong">SecurityHandler.</span><code><strong><a href="../../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html#prepareForDecryption(org.apache.pdfbox.pdmodel.encryption.PDEncryption, org.apache.pdfbox.cos.COSArray, org.apache.pdfbox.pdmodel.encryption.DecryptionMaterial)">prepareForDecryption</a></strong>(<a href="../../../../../../org/apache/pdfbox/pdmodel/encryption/PDEncryption.html" title="class in org.apache.pdfbox.pdmodel.encryption">PDEncryption</a>&nbsp;encryption,
                     <a href="../../../../../../org/apache/pdfbox/cos/COSArray.html" title="class in org.apache.pdfbox.cos">COSArray</a>&nbsp;documentIDArray,
@@ -184,7 +137,7 @@
 <div class="block">Prepares everything to decrypt the document.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="strong">PublicKeySecurityHandler.</span><code><strong><a href="../../../../../../org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.html#prepareForDecryption(org.apache.pdfbox.pdmodel.encryption.PDEncryption, org.apache.pdfbox.cos.COSArray, org.apache.pdfbox.pdmodel.encryption.DecryptionMaterial)">prepareForDecryption</a></strong>(<a href="../../../../../../org/apache/pdfbox/pdmodel/encryption/PDEncryption.html" title="class in org.apache.pdfbox.pdmodel.encryption">PDEncryption</a>&nbsp;encryption,
                     <a href="../../../../../../org/apache/pdfbox/cos/COSArray.html" title="class in org.apache.pdfbox.cos">COSArray</a>&nbsp;documentIDArray,

Modified: pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/InvalidPasswordException.html
URL: http://svn.apache.org/viewvc/pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/InvalidPasswordException.html?rev=1669997&r1=1669996&r2=1669997&view=diff
==============================================================================
--- pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/InvalidPasswordException.html (original)
+++ pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/InvalidPasswordException.html Mon Mar 30 05:51:10 2015
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (version 1.7.0_55) on Sun Jan 04 20:50:39 CET 2015 -->
+<!-- Generated by javadoc (version 1.7.0_55) on Mon Mar 30 07:22:02 CEST 2015 -->
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
 <title>Uses of Class org.apache.pdfbox.pdmodel.encryption.InvalidPasswordException (Apache PDFBox 2.0.0-SNAPSHOT API)</title>
-<meta name="date" content="2015-01-04">
+<meta name="date" content="2015-03-30">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 </head>
 <body>

Modified: pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/PDCryptFilterDictionary.html
URL: http://svn.apache.org/viewvc/pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/PDCryptFilterDictionary.html?rev=1669997&r1=1669996&r2=1669997&view=diff
==============================================================================
--- pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/PDCryptFilterDictionary.html (original)
+++ pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/PDCryptFilterDictionary.html Mon Mar 30 05:51:10 2015
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (version 1.7.0_55) on Sun Jan 04 20:50:39 CET 2015 -->
+<!-- Generated by javadoc (version 1.7.0_55) on Mon Mar 30 07:22:02 CEST 2015 -->
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
 <title>Uses of Class org.apache.pdfbox.pdmodel.encryption.PDCryptFilterDictionary (Apache PDFBox 2.0.0-SNAPSHOT API)</title>
-<meta name="date" content="2015-01-04">
+<meta name="date" content="2015-03-30">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 </head>
 <body>

Modified: pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/PDEncryption.html
URL: http://svn.apache.org/viewvc/pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/PDEncryption.html?rev=1669997&r1=1669996&r2=1669997&view=diff
==============================================================================
--- pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/PDEncryption.html (original)
+++ pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/PDEncryption.html Mon Mar 30 05:51:10 2015
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (version 1.7.0_55) on Sun Jan 04 20:50:39 CET 2015 -->
+<!-- Generated by javadoc (version 1.7.0_55) on Mon Mar 30 07:22:02 CEST 2015 -->
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
 <title>Uses of Class org.apache.pdfbox.pdmodel.encryption.PDEncryption (Apache PDFBox 2.0.0-SNAPSHOT API)</title>
-<meta name="date" content="2015-01-04">
+<meta name="date" content="2015-03-30">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 </head>
 <body>
@@ -110,14 +110,6 @@
 <div class="block">This will get the encryption dictionary for this document.</div>
 </td>
 </tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="../../../../../../org/apache/pdfbox/pdmodel/encryption/PDEncryption.html" title="class in org.apache.pdfbox.pdmodel.encryption">PDEncryption</a></code></td>
-<td class="colLast"><span class="strong">PDDocument.</span><code><strong><a href="../../../../../../org/apache/pdfbox/pdmodel/PDDocument.html#getEncryptionDictionary()">getEncryptionDictionary</a></strong>()</code>
-<div class="block"><strong>Deprecated.</strong>&nbsp;
-<div class="block"><i>Use <a href="../../../../../../org/apache/pdfbox/pdmodel/PDDocument.html#getEncryption()"><code>PDDocument.getEncryption()</code></a> instead.</i></div>
-</div>
-</td>
-</tr>
 </tbody>
 </table>
 <table border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">

Modified: pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/PDEncryptionDictionary.html
URL: http://svn.apache.org/viewvc/pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/PDEncryptionDictionary.html?rev=1669997&r1=1669996&r2=1669997&view=diff
==============================================================================
--- pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/PDEncryptionDictionary.html (original)
+++ pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/PDEncryptionDictionary.html Mon Mar 30 05:51:10 2015
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (version 1.7.0_55) on Sun Jan 04 20:50:39 CET 2015 -->
+<!-- Generated by javadoc (version 1.7.0_55) on Mon Mar 30 07:22:02 CEST 2015 -->
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
 <title>Uses of Class org.apache.pdfbox.pdmodel.encryption.PDEncryptionDictionary (Apache PDFBox 2.0.0-SNAPSHOT API)</title>
-<meta name="date" content="2015-01-04">
+<meta name="date" content="2015-03-30">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 </head>
 <body>

Modified: pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/ProtectionPolicy.html
URL: http://svn.apache.org/viewvc/pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/ProtectionPolicy.html?rev=1669997&r1=1669996&r2=1669997&view=diff
==============================================================================
--- pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/ProtectionPolicy.html (original)
+++ pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/ProtectionPolicy.html Mon Mar 30 05:51:10 2015
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (version 1.7.0_55) on Sun Jan 04 20:50:39 CET 2015 -->
+<!-- Generated by javadoc (version 1.7.0_55) on Mon Mar 30 07:22:02 CEST 2015 -->
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
 <title>Uses of Class org.apache.pdfbox.pdmodel.encryption.ProtectionPolicy (Apache PDFBox 2.0.0-SNAPSHOT API)</title>
-<meta name="date" content="2015-01-04">
+<meta name="date" content="2015-03-30">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 </head>
 <body>

Modified: pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/PublicKeyDecryptionMaterial.html
URL: http://svn.apache.org/viewvc/pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/PublicKeyDecryptionMaterial.html?rev=1669997&r1=1669996&r2=1669997&view=diff
==============================================================================
--- pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/PublicKeyDecryptionMaterial.html (original)
+++ pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/PublicKeyDecryptionMaterial.html Mon Mar 30 05:51:10 2015
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (version 1.7.0_55) on Sun Jan 04 20:50:39 CET 2015 -->
+<!-- Generated by javadoc (version 1.7.0_55) on Mon Mar 30 07:22:02 CEST 2015 -->
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
 <title>Uses of Class org.apache.pdfbox.pdmodel.encryption.PublicKeyDecryptionMaterial (Apache PDFBox 2.0.0-SNAPSHOT API)</title>
-<meta name="date" content="2015-01-04">
+<meta name="date" content="2015-03-30">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 </head>
 <body>

Modified: pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/PublicKeyProtectionPolicy.html
URL: http://svn.apache.org/viewvc/pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/PublicKeyProtectionPolicy.html?rev=1669997&r1=1669996&r2=1669997&view=diff
==============================================================================
--- pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/PublicKeyProtectionPolicy.html (original)
+++ pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/PublicKeyProtectionPolicy.html Mon Mar 30 05:51:10 2015
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (version 1.7.0_55) on Sun Jan 04 20:50:39 CET 2015 -->
+<!-- Generated by javadoc (version 1.7.0_55) on Mon Mar 30 07:22:02 CEST 2015 -->
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
 <title>Uses of Class org.apache.pdfbox.pdmodel.encryption.PublicKeyProtectionPolicy (Apache PDFBox 2.0.0-SNAPSHOT API)</title>
-<meta name="date" content="2015-01-04">
+<meta name="date" content="2015-03-30">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 </head>
 <body>

Modified: pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/PublicKeyRecipient.html
URL: http://svn.apache.org/viewvc/pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/PublicKeyRecipient.html?rev=1669997&r1=1669996&r2=1669997&view=diff
==============================================================================
--- pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/PublicKeyRecipient.html (original)
+++ pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/PublicKeyRecipient.html Mon Mar 30 05:51:10 2015
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (version 1.7.0_55) on Sun Jan 04 20:50:39 CET 2015 -->
+<!-- Generated by javadoc (version 1.7.0_55) on Mon Mar 30 07:22:02 CEST 2015 -->
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
 <title>Uses of Class org.apache.pdfbox.pdmodel.encryption.PublicKeyRecipient (Apache PDFBox 2.0.0-SNAPSHOT API)</title>
-<meta name="date" content="2015-01-04">
+<meta name="date" content="2015-03-30">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 </head>
 <body>

Modified: pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/PublicKeySecurityHandler.html
URL: http://svn.apache.org/viewvc/pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/PublicKeySecurityHandler.html?rev=1669997&r1=1669996&r2=1669997&view=diff
==============================================================================
--- pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/PublicKeySecurityHandler.html (original)
+++ pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/PublicKeySecurityHandler.html Mon Mar 30 05:51:10 2015
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (version 1.7.0_55) on Sun Jan 04 20:50:39 CET 2015 -->
+<!-- Generated by javadoc (version 1.7.0_55) on Mon Mar 30 07:22:02 CEST 2015 -->
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
 <title>Uses of Class org.apache.pdfbox.pdmodel.encryption.PublicKeySecurityHandler (Apache PDFBox 2.0.0-SNAPSHOT API)</title>
-<meta name="date" content="2015-01-04">
+<meta name="date" content="2015-03-30">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 </head>
 <body>

Modified: pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/SecurityHandler.html
URL: http://svn.apache.org/viewvc/pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/SecurityHandler.html?rev=1669997&r1=1669996&r2=1669997&view=diff
==============================================================================
--- pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/SecurityHandler.html (original)
+++ pdfbox/cmssite/trunk/content/docs/2.0.0-SNAPSHOT/javadocs/org/apache/pdfbox/pdmodel/encryption/class-use/SecurityHandler.html Mon Mar 30 05:51:10 2015
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (version 1.7.0_55) on Sun Jan 04 20:50:39 CET 2015 -->
+<!-- Generated by javadoc (version 1.7.0_55) on Mon Mar 30 07:22:02 CEST 2015 -->
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
 <title>Uses of Class org.apache.pdfbox.pdmodel.encryption.SecurityHandler (Apache PDFBox 2.0.0-SNAPSHOT API)</title>
-<meta name="date" content="2015-01-04">
+<meta name="date" content="2015-03-30">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 </head>
 <body>
@@ -83,12 +83,6 @@
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="#org.apache.pdfbox.pdmodel">org.apache.pdfbox.pdmodel</a></td>
-<td class="colLast">
-<div class="block">The PDModel package represents a high level API for creating and manipulating PDF documents.</div>
-</td>
-</tr>
-<tr class="altColor">
 <td class="colFirst"><a href="#org.apache.pdfbox.pdmodel.encryption">org.apache.pdfbox.pdmodel.encryption</a></td>
 <td class="colLast">
 <div class="block">The encryption package will handle the PDF document security handlers and the functionality of pluggable security handlers.</div>
@@ -112,51 +106,11 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>protected <a href="../../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html" title="class in org.apache.pdfbox.pdmodel.encryption">SecurityHandler</a></code></td>
-<td class="colLast"><span class="strong">NonSequentialPDFParser.</span><code><strong><a href="../../../../../../org/apache/pdfbox/pdfparser/NonSequentialPDFParser.html#securityHandler">securityHandler</a></strong></code>
+<td class="colLast"><span class="strong">COSParser.</span><code><strong><a href="../../../../../../org/apache/pdfbox/pdfparser/COSParser.html#securityHandler">securityHandler</a></strong></code>
 <div class="block">The security handler.</div>
 </td>
 </tr>
 </tbody>
-</table>
-</li>
-<li class="blockList"><a name="org.apache.pdfbox.pdmodel">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html" title="class in org.apache.pdfbox.pdmodel.encryption">SecurityHandler</a> in <a href="../../../../../../org/apache/pdfbox/pdmodel/package-summary.html">org.apache.pdfbox.pdmodel</a></h3>
-<table border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../../../../../org/apache/pdfbox/pdmodel/package-summary.html">org.apache.pdfbox.pdmodel</a> that return <a href="../../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html" title="class in org.apache.pdfbox.pdmodel.encryption">SecurityHandler</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html" title="class in org.apache.pdfbox.pdmodel.encryption">SecurityHandler</a></code></td>
-<td class="colLast"><span class="strong">PDDocument.</span><code><strong><a href="../../../../../../org/apache/pdfbox/pdmodel/PDDocument.html#getSecurityHandler()">getSecurityHandler</a></strong>()</code>
-<div class="block"><strong>Deprecated.</strong>&nbsp;
-<div class="block"><i>Use <a href="../../../../../../org/apache/pdfbox/pdmodel/PDDocument.html#getEncryption()"><code>PDDocument.getEncryption()</code></a>.
- <a href="../../../../../../org/apache/pdfbox/pdmodel/encryption/PDEncryption.html#getSecurityHandler()"><code>PDEncryption.getSecurityHandler()</code></a></i></div>
-</div>
-</td>
-</tr>
-</tbody>
-</table>
-<table border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../../../../../org/apache/pdfbox/pdmodel/package-summary.html">org.apache.pdfbox.pdmodel</a> with parameters of type <a href="../../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html" title="class in org.apache.pdfbox.pdmodel.encryption">SecurityHandler</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="strong">PDDocument.</span><code><strong><a href="../../../../../../org/apache/pdfbox/pdmodel/PDDocument.html#setSecurityHandler(org.apache.pdfbox.pdmodel.encryption.SecurityHandler)">setSecurityHandler</a></strong>(<a href="../../../../../../org/apache/pdfbox/pdmodel/encryption/SecurityHandler.html" title="class in org.apache.pdfbox.pdmodel.encryption">SecurityHandler</a>&nbsp;securityHandler)</code>
-<div class="block"><strong>Deprecated.</strong>&nbsp;
-<div class="block"><i>Use protection policies instead.</i></div>
-</div>
-</td>
-</tr>
-</tbody>
 </table>
 </li>
 <li class="blockList"><a name="org.apache.pdfbox.pdmodel.encryption">