Author: nick
Date: Sun Mar 13 21:20:00 2016
New Revision: 1734859
URL: http://svn.apache.org/viewvc?rev=1734859&view=rev
Log:
Republish site
Modified:
poi/site/publish/apidocs/constant-values.html
poi/site/publish/apidocs/index-all.html
poi/site/publish/apidocs/org/apache/poi/hslf/dev/PPTXMLDump.html
poi/site/publish/apidocs/org/apache/poi/poifs/crypt/CryptoFunctions.html
poi/site/publish/apidocs/org/apache/poi/poifs/crypt/class-use/ChainingMode.html
poi/site/publish/apidocs/org/apache/poi/poifs/crypt/class-use/CipherAlgorithm.html
poi/site/publish/apidocs/org/apache/poi/poifs/crypt/class-use/HashAlgorithm.html
poi/site/publish/apidocs/org/apache/poi/util/TempFile.html
poi/site/publish/apidocs/org/apache/poi/util/class-use/Internal.html
poi/site/publish/changes.html
poi/site/publish/changes.rss
poi/site/publish/download.html
Modified: poi/site/publish/apidocs/constant-values.html
URL:
http://svn.apache.org/viewvc/poi/site/publish/apidocs/constant-values.html?rev=1734859&r1=1734858&r2=1734859&view=diff
==============================================================================
--- poi/site/publish/apidocs/constant-values.html (original)
+++ poi/site/publish/apidocs/constant-values.html Sun Mar 13 21:20:00 2016
@@ -4674,48 +4674,6 @@
<ul class="blockList">
<li class="blockList">
<table border="0" cellpadding="3" cellspacing="0" summary="Constant Field
Values table, listing constant fields, and values">
-<caption><span>org.apache.poi.hslf.dev.<a
href="org/apache/poi/hslf/dev/PPTXMLDump.html" title="class in
org.apache.poi.hslf.dev">PPTXMLDump</a></span><span
class="tabEnd"> </span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th scope="col">Constant Field</th>
-<th class="colLast" scope="col">Value</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a name="org.apache.poi.hslf.dev.PPTXMLDump.HEADER_SIZE">
-<!-- -->
-</a><code>public static final int</code></td>
-<td><code><a
href="org/apache/poi/hslf/dev/PPTXMLDump.html#HEADER_SIZE">HEADER_SIZE</a></code></td>
-<td class="colLast"><code>8</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a
name="org.apache.poi.hslf.dev.PPTXMLDump.PICT_HEADER_SIZE">
-<!-- -->
-</a><code>public static final int</code></td>
-<td><code><a
href="org/apache/poi/hslf/dev/PPTXMLDump.html#PICT_HEADER_SIZE">PICT_HEADER_SIZE</a></code></td>
-<td class="colLast"><code>25</code></td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a
name="org.apache.poi.hslf.dev.PPTXMLDump.PICTURES_ENTRY">
-<!-- -->
-</a><code>public static final java.lang.String</code></td>
-<td><code><a
href="org/apache/poi/hslf/dev/PPTXMLDump.html#PICTURES_ENTRY">PICTURES_ENTRY</a></code></td>
-<td class="colLast"><code>"Pictures"</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="org.apache.poi.hslf.dev.PPTXMLDump.PPDOC_ENTRY">
-<!-- -->
-</a><code>public static final java.lang.String</code></td>
-<td><code><a
href="org/apache/poi/hslf/dev/PPTXMLDump.html#PPDOC_ENTRY">PPDOC_ENTRY</a></code></td>
-<td class="colLast"><code>"PowerPoint Document"</code></td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList">
-<table border="0" cellpadding="3" cellspacing="0" summary="Constant Field
Values table, listing constant fields, and values">
<caption><span>org.apache.poi.hslf.model.<a
href="org/apache/poi/hslf/model/ActiveXShape.html" title="class in
org.apache.poi.hslf.model">ActiveXShape</a></span><span
class="tabEnd"> </span></caption>
<tr>
<th class="colFirst" scope="col">Modifier and Type</th>
@@ -28115,6 +28073,25 @@
</tr>
</tbody>
</table>
+</li>
+<li class="blockList">
+<table border="0" cellpadding="3" cellspacing="0" summary="Constant Field
Values table, listing constant fields, and values">
+<caption><span>org.apache.poi.util.<a href="org/apache/poi/util/TempFile.html"
title="class in org.apache.poi.util">TempFile</a></span><span
class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th scope="col">Constant Field</th>
+<th class="colLast" scope="col">Value</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a name="org.apache.poi.util.TempFile.JAVA_IO_TMPDIR">
+<!-- -->
+</a><code>public static final java.lang.String</code></td>
+<td><code><a
href="org/apache/poi/util/TempFile.html#JAVA_IO_TMPDIR">JAVA_IO_TMPDIR</a></code></td>
+<td class="colLast"><code>"java.io.tmpdir"</code></td>
+</tr>
+</tbody>
+</table>
</li>
<li class="blockList">
<table border="0" cellpadding="3" cellspacing="0" summary="Constant Field
Values table, listing constant fields, and values">
Modified: poi/site/publish/apidocs/index-all.html
URL:
http://svn.apache.org/viewvc/poi/site/publish/apidocs/index-all.html?rev=1734859&r1=1734858&r2=1734859&view=diff
==============================================================================
--- poi/site/publish/apidocs/index-all.html (original)
+++ poi/site/publish/apidocs/index-all.html Sun Mar 13 21:20:00 2016
@@ -7609,8 +7609,6 @@
<dd>
<div class="block">Codepage for Windows 1258</div>
</dd>
-<dt><span class="strong"><a
href="./org/apache/poi/hslf/dev/PPTXMLDump.html#CR">CR</a></span> - Static
variable in class org.apache.poi.hslf.dev.<a
href="./org/apache/poi/hslf/dev/PPTXMLDump.html" title="class in
org.apache.poi.hslf.dev">PPTXMLDump</a></dt>
-<dd> </dd>
<dt><span class="strong"><a
href="./org/apache/poi/ss/formula/ptg/AttrPtg.SpaceType.html#CR_BEFORE">CR_BEFORE</a></span>
- Static variable in class org.apache.poi.ss.formula.ptg.<a
href="./org/apache/poi/ss/formula/ptg/AttrPtg.SpaceType.html" title="class in
org.apache.poi.ss.formula.ptg">AttrPtg.SpaceType</a></dt>
<dd>
<div class="block">01H = Carriage returns before the next token (not allowed
before tParen token)</div>
@@ -12114,8 +12112,6 @@
<dd> </dd>
<dt><span class="strong"><a
href="./org/apache/poi/hwpf/model/types/SEPAbstractType.html#DMORIENTPAGE_PORTRAIT">DMORIENTPAGE_PORTRAIT</a></span>
- Static variable in class org.apache.poi.hwpf.model.types.<a
href="./org/apache/poi/hwpf/model/types/SEPAbstractType.html" title="class in
org.apache.poi.hwpf.model.types">SEPAbstractType</a></dt>
<dd> </dd>
-<dt><span class="strong"><a
href="./org/apache/poi/hslf/dev/PPTXMLDump.html#docstream">docstream</a></span>
- Variable in class org.apache.poi.hslf.dev.<a
href="./org/apache/poi/hslf/dev/PPTXMLDump.html" title="class in
org.apache.poi.hslf.dev">PPTXMLDump</a></dt>
-<dd> </dd>
<dt><a href="./org/apache/poi/hslf/record/Document.html" title="class in
org.apache.poi.hslf.record"><span class="strong">Document</span></a> - Class in
<a
href="./org/apache/poi/hslf/record/package-summary.html">org.apache.poi.hslf.record</a></dt>
<dd>
<div class="block">Master container for Document.</div>
@@ -18866,15 +18862,11 @@
<dd> </dd>
<dt><span class="strong"><a
href="./org/apache/poi/poifs/crypt/CryptoFunctions.html#generateIv(org.apache.poi.poifs.crypt.HashAlgorithm,%20byte[],%20byte[],%20int)">generateIv(HashAlgorithm,
byte[], byte[], int)</a></span> - Static method in class
org.apache.poi.poifs.crypt.<a
href="./org/apache/poi/poifs/crypt/CryptoFunctions.html" title="class in
org.apache.poi.poifs.crypt">CryptoFunctions</a></dt>
<dd>
-<div class="block">2.3.4.12 Initialization Vector Generation (Agile Encryption)
-
- Initialization vectors are used in all cases for agile encryption.</div>
+<div class="block"><cite>2.3.4.12 Initialization Vector Generation (Agile
Encryption)</cite></div>
</dd>
<dt><span class="strong"><a
href="./org/apache/poi/poifs/crypt/CryptoFunctions.html#generateKey(byte[],%20org.apache.poi.poifs.crypt.HashAlgorithm,%20byte[],%20int)">generateKey(byte[],
HashAlgorithm, byte[], int)</a></span> - Static method in class
org.apache.poi.poifs.crypt.<a
href="./org/apache/poi/poifs/crypt/CryptoFunctions.html" title="class in
org.apache.poi.poifs.crypt">CryptoFunctions</a></dt>
<dd>
-<div class="block">2.3.4.11 Encryption Key Generation (Agile Encryption)
-
- ...</div>
+<div class="block"><cite>2.3.4.11 Encryption Key Generation (Agile
Encryption)</cite></div>
</dd>
<dt><span class="strong"><a
href="./org/apache/poi/xssf/usermodel/XSSFHyperlink.html#generateRelationIfNeeded(org.apache.poi.openxml4j.opc.PackagePart)">generateRelationIfNeeded(PackagePart)</a></span>
- Method in class org.apache.poi.xssf.usermodel.<a
href="./org/apache/poi/xssf/usermodel/XSSFHyperlink.html" title="class in
org.apache.poi.xssf.usermodel">XSSFHyperlink</a></dt>
<dd>
@@ -20073,10 +20065,6 @@
<dd>
<div class="block">Returns a new byte array with a truncated to the given
size.</div>
</dd>
-<dt><span class="strong"><a
href="./org/apache/poi/poifs/crypt/CryptoFunctions.html#getBlock36(byte[],%20int)">getBlock36(byte[],
int)</a></span> - Static method in class org.apache.poi.poifs.crypt.<a
href="./org/apache/poi/poifs/crypt/CryptoFunctions.html" title="class in
org.apache.poi.poifs.crypt">CryptoFunctions</a></dt>
-<dd>
-<div class="block">Returns a new byte array with a truncated to the given
size.</div>
-</dd>
<dt><span class="strong"><a
href="./org/apache/poi/poifs/filesystem/BlockStore.html#getBlockAt(int)">getBlockAt(int)</a></span>
- Method in class org.apache.poi.poifs.filesystem.<a
href="./org/apache/poi/poifs/filesystem/BlockStore.html" title="class in
org.apache.poi.poifs.filesystem">BlockStore</a></dt>
<dd>
<div class="block">Load the block at the given offset.</div>
@@ -21810,7 +21798,11 @@
<dt><span class="strong"><a
href="./org/apache/poi/hsmf/datatypes/RecipientChunks.html#getChunks()">getChunks()</a></span>
- Method in class org.apache.poi.hsmf.datatypes.<a
href="./org/apache/poi/hsmf/datatypes/RecipientChunks.html" title="class in
org.apache.poi.hsmf.datatypes">RecipientChunks</a></dt>
<dd> </dd>
<dt><span class="strong"><a
href="./org/apache/poi/poifs/crypt/CryptoFunctions.html#getCipher(javax.crypto.SecretKey,%20org.apache.poi.poifs.crypt.CipherAlgorithm,%20org.apache.poi.poifs.crypt.ChainingMode,%20byte[],%20int)">getCipher(SecretKey,
CipherAlgorithm, ChainingMode, byte[], int)</a></span> - Static method in
class org.apache.poi.poifs.crypt.<a
href="./org/apache/poi/poifs/crypt/CryptoFunctions.html" title="class in
org.apache.poi.poifs.crypt">CryptoFunctions</a></dt>
-<dd> </dd>
+<dd>
+<div class="block">Initialize a new cipher object with the given cipher
properties and no padding
+ If the given algorithm is not implemented in the JCE, it will try to load it
from the bouncy castle
+ provider.</div>
+</dd>
<dt><span class="strong"><a
href="./org/apache/poi/poifs/crypt/CryptoFunctions.html#getCipher(java.security.Key,%20org.apache.poi.poifs.crypt.CipherAlgorithm,%20org.apache.poi.poifs.crypt.ChainingMode,%20byte[],%20int,%20java.lang.String)">getCipher(Key,
CipherAlgorithm, ChainingMode, byte[], int, String)</a></span> - Static method
in class org.apache.poi.poifs.crypt.<a
href="./org/apache/poi/poifs/crypt/CryptoFunctions.html" title="class in
org.apache.poi.poifs.crypt">CryptoFunctions</a></dt>
<dd>
<div class="block">Initialize a new cipher object with the given cipher
properties
@@ -42812,12 +42804,8 @@
</dd>
<dt><span class="strong"><a
href="./org/apache/poi/poifs/crypt/CryptoFunctions.html#hashPassword(java.lang.String,%20org.apache.poi.poifs.crypt.HashAlgorithm,%20byte[],%20int)">hashPassword(String,
HashAlgorithm, byte[], int)</a></span> - Static method in class
org.apache.poi.poifs.crypt.<a
href="./org/apache/poi/poifs/crypt/CryptoFunctions.html" title="class in
org.apache.poi.poifs.crypt">CryptoFunctions</a></dt>
<dd>
-<div class="block">2.3.4.7 ECMA-376 Document Encryption Key Generation
(Standard Encryption)
- 2.3.4.11 Encryption Key Generation (Agile Encryption)
-
- The encryption key for ECMA-376 document encryption [ECMA-376] using agile
encryption MUST be
- generated by using the following method, which is derived from PKCS #5:
Password-Based
- Cryptography Version 2.0 [RFC2898].</div>
+<div class="block"><cite>2.3.4.7 ECMA-376 Document Encryption Key Generation
(Standard Encryption)<br/>
+ 2.3.4.11 Encryption Key Generation (Agile Encryption)</cite></div>
</dd>
<dt><span class="strong"><a
href="./org/apache/poi/poifs/crypt/CryptoFunctions.html#hashPassword(java.lang.String,%20org.apache.poi.poifs.crypt.HashAlgorithm,%20byte[],%20int,%20boolean)">hashPassword(String,
HashAlgorithm, byte[], int, boolean)</a></span> - Static method in class
org.apache.poi.poifs.crypt.<a
href="./org/apache/poi/poifs/crypt/CryptoFunctions.html" title="class in
org.apache.poi.poifs.crypt">CryptoFunctions</a></dt>
<dd>
@@ -43064,8 +43052,6 @@
<dd> </dd>
<dt><span class="strong"><a
href="./org/apache/poi/hmef/HMEFMessage.html#HEADER_SIGNATURE">HEADER_SIGNATURE</a></span>
- Static variable in class org.apache.poi.hmef.<a
href="./org/apache/poi/hmef/HMEFMessage.html" title="class in
org.apache.poi.hmef">HMEFMessage</a></dt>
<dd> </dd>
-<dt><span class="strong"><a
href="./org/apache/poi/hslf/dev/PPTXMLDump.html#HEADER_SIZE">HEADER_SIZE</a></span>
- Static variable in class org.apache.poi.hslf.dev.<a
href="./org/apache/poi/hslf/dev/PPTXMLDump.html" title="class in
org.apache.poi.hslf.dev">PPTXMLDump</a></dt>
-<dd> </dd>
<dt><span class="strong"><a
href="./org/apache/poi/hslf/record/HeadersFootersContainer.html#HEADERATOM">HEADERATOM</a></span>
- Static variable in class org.apache.poi.hslf.record.<a
href="./org/apache/poi/hslf/record/HeadersFootersContainer.html" title="class
in org.apache.poi.hslf.record">HeadersFootersContainer</a></dt>
<dd> </dd>
<dt><a href="./org/apache/poi/poifs/storage/HeaderBlock.html" title="class in
org.apache.poi.poifs.storage"><span class="strong">HeaderBlock</span></a> -
Class in <a
href="./org/apache/poi/poifs/storage/package-summary.html">org.apache.poi.poifs.storage</a></dt>
@@ -43220,8 +43206,6 @@
<dd>
<div class="block">dump data in hexadecimal format</div>
</dd>
-<dt><span class="strong"><a
href="./org/apache/poi/hslf/dev/PPTXMLDump.html#hexHeader">hexHeader</a></span>
- Variable in class org.apache.poi.hslf.dev.<a
href="./org/apache/poi/hslf/dev/PPTXMLDump.html" title="class in
org.apache.poi.hslf.dev">PPTXMLDump</a></dt>
-<dd> </dd>
<dt><a href="./org/apache/poi/util/HexRead.html" title="class in
org.apache.poi.util"><span class="strong">HexRead</span></a> - Class in <a
href="./org/apache/poi/util/package-summary.html">org.apache.poi.util</a></dt>
<dd>
<div class="block">Utilities to read hex from files.</div>
@@ -50542,6 +50526,10 @@
</a>
<h2 class="title">J</h2>
<dl>
+<dt><span class="strong"><a
href="./org/apache/poi/util/TempFile.html#JAVA_IO_TMPDIR">JAVA_IO_TMPDIR</a></span>
- Static variable in class org.apache.poi.util.<a
href="./org/apache/poi/util/TempFile.html" title="class in
org.apache.poi.util">TempFile</a></dt>
+<dd>
+<div class="block">Define a constant for this property as it is sometimes
mistypes as "tempdir" otherwise</div>
+</dd>
<dt><span class="strong"><a
href="./org/apache/poi/poifs/crypt/HashAlgorithm.html#jceHmacId">jceHmacId</a></span>
- Variable in enum org.apache.poi.poifs.crypt.<a
href="./org/apache/poi/poifs/crypt/HashAlgorithm.html" title="enum in
org.apache.poi.poifs.crypt">HashAlgorithm</a></dt>
<dd> </dd>
<dt><span class="strong"><a
href="./org/apache/poi/poifs/crypt/ChainingMode.html#jceId">jceId</a></span> -
Variable in enum org.apache.poi.poifs.crypt.<a
href="./org/apache/poi/poifs/crypt/ChainingMode.html" title="enum in
org.apache.poi.poifs.crypt">ChainingMode</a></dt>
@@ -55360,8 +55348,6 @@ Compound Document Format.</div>
<dd> </dd>
<dt><span class="strong"><a
href="./org/apache/poi/hslf/record/TextHeaderAtom.html#OTHER_TYPE">OTHER_TYPE</a></span>
- Static variable in class org.apache.poi.hslf.record.<a
href="./org/apache/poi/hslf/record/TextHeaderAtom.html" title="class in
org.apache.poi.hslf.record">TextHeaderAtom</a></dt>
<dd> </dd>
-<dt><span class="strong"><a
href="./org/apache/poi/hslf/dev/PPTXMLDump.html#out">out</a></span> - Variable
in class org.apache.poi.hslf.dev.<a
href="./org/apache/poi/hslf/dev/PPTXMLDump.html" title="class in
org.apache.poi.hslf.dev">PPTXMLDump</a></dt>
-<dd> </dd>
<dt><a href="./org/apache/poi/sl/draw/geom/Outline.html" title="class in
org.apache.poi.sl.draw.geom"><span class="strong">Outline</span></a> - Class in
<a
href="./org/apache/poi/sl/draw/geom/package-summary.html">org.apache.poi.sl.draw.geom</a></dt>
<dd>
<div class="block">Date: 11/6/11</div>
@@ -56216,10 +56202,6 @@ Compound Document Format.</div>
<dd>
<div class="block">skip the first 512 bytes - they are MAC specific crap</div>
</dd>
-<dt><span class="strong"><a
href="./org/apache/poi/hslf/dev/PPTXMLDump.html#PICT_HEADER_SIZE">PICT_HEADER_SIZE</a></span>
- Static variable in class org.apache.poi.hslf.dev.<a
href="./org/apache/poi/hslf/dev/PPTXMLDump.html" title="class in
org.apache.poi.hslf.dev">PPTXMLDump</a></dt>
-<dd> </dd>
-<dt><span class="strong"><a
href="./org/apache/poi/hslf/dev/PPTXMLDump.html#pictstream">pictstream</a></span>
- Variable in class org.apache.poi.hslf.dev.<a
href="./org/apache/poi/hslf/dev/PPTXMLDump.html" title="class in
org.apache.poi.hslf.dev">PPTXMLDump</a></dt>
-<dd> </dd>
<dt><a href="./org/apache/poi/hwpf/usermodel/Picture.html" title="class in
org.apache.poi.hwpf.usermodel"><span class="strong">Picture</span></a> - Class
in <a
href="./org/apache/poi/hwpf/usermodel/package-summary.html">org.apache.poi.hwpf.usermodel</a></dt>
<dd>
<div class="block">Represents embedded picture extracted from Word
Document</div>
@@ -56340,8 +56322,6 @@ Compound Document Format.</div>
<dd> </dd>
<dt><span class="strong"><a
href="./org/apache/poi/xwpf/usermodel/XWPFDocument.html#pictures">pictures</a></span>
- Variable in class org.apache.poi.xwpf.usermodel.<a
href="./org/apache/poi/xwpf/usermodel/XWPFDocument.html" title="class in
org.apache.poi.xwpf.usermodel">XWPFDocument</a></dt>
<dd> </dd>
-<dt><span class="strong"><a
href="./org/apache/poi/hslf/dev/PPTXMLDump.html#PICTURES_ENTRY">PICTURES_ENTRY</a></span>
- Static variable in class org.apache.poi.hslf.dev.<a
href="./org/apache/poi/hslf/dev/PPTXMLDump.html" title="class in
org.apache.poi.hslf.dev">PPTXMLDump</a></dt>
-<dd> </dd>
<dt><a href="./org/apache/poi/hssf/model/PictureShape.html" title="class in
org.apache.poi.hssf.model"><span class="strong">PictureShape</span></a> - Class
in <a
href="./org/apache/poi/hssf/model/package-summary.html">org.apache.poi.hssf.model</a></dt>
<dd>
<div class="block">Represents a picture shape and creates all specific low
level records.</div>
@@ -57373,8 +57353,6 @@ Compound Document Format.</div>
<dd> </dd>
<dt><span class="strong"><a
href="./org/apache/poi/hslf/record/TextSpecInfoRun.html#pp10extMask">pp10extMask</a></span>
- Variable in class org.apache.poi.hslf.record.<a
href="./org/apache/poi/hslf/record/TextSpecInfoRun.html" title="class in
org.apache.poi.hslf.record">TextSpecInfoRun</a></dt>
<dd> </dd>
-<dt><span class="strong"><a
href="./org/apache/poi/hslf/dev/PPTXMLDump.html#PPDOC_ENTRY">PPDOC_ENTRY</a></span>
- Static variable in class org.apache.poi.hslf.dev.<a
href="./org/apache/poi/hslf/dev/PPTXMLDump.html" title="class in
org.apache.poi.hslf.dev">PPTXMLDump</a></dt>
-<dd> </dd>
<dt><a href="./org/apache/poi/hslf/record/PPDrawing.html" title="class in
org.apache.poi.hslf.record"><span class="strong">PPDrawing</span></a> - Class
in <a
href="./org/apache/poi/hslf/record/package-summary.html">org.apache.poi.hslf.record</a></dt>
<dd>
<div class="block">These are actually wrappers onto Escher drawings.</div>
Modified: poi/site/publish/apidocs/org/apache/poi/hslf/dev/PPTXMLDump.html
URL:
http://svn.apache.org/viewvc/poi/site/publish/apidocs/org/apache/poi/hslf/dev/PPTXMLDump.html?rev=1734859&r1=1734858&r2=1734859&view=diff
==============================================================================
--- poi/site/publish/apidocs/org/apache/poi/hslf/dev/PPTXMLDump.html (original)
+++ poi/site/publish/apidocs/org/apache/poi/hslf/dev/PPTXMLDump.html Sun Mar 13
21:20:00 2016
@@ -60,13 +60,13 @@
<ul class="subNavList">
<li>Summary: </li>
<li>Nested | </li>
-<li><a href="#field_summary">Field</a> | </li>
+<li>Field | </li>
<li><a href="#constructor_summary">Constr</a> | </li>
<li><a href="#method_summary">Method</a></li>
</ul>
<ul class="subNavList">
<li>Detail: </li>
-<li><a href="#field_detail">Field</a> | </li>
+<li>Field | </li>
<li><a href="#constructor_detail">Constr</a> | </li>
<li><a href="#method_detail">Method</a></li>
</ul>
@@ -97,65 +97,12 @@
<pre>public final class <span class="strong">PPTXMLDump</span>
extends java.lang.Object</pre>
<div class="block">Utility class which dumps raw contents of a ppt file into
XML format</div>
-<dl><dt><span class="strong">Author:</span></dt>
- <dd>Yegor Kozlov</dd></dl>
</li>
</ul>
</div>
<div class="summary">
<ul class="blockList">
<li class="blockList">
-<!-- =========== FIELD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="field_summary">
-<!-- -->
-</a>
-<h3>Field Summary</h3>
-<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0"
summary="Field Summary table, listing fields, and an explanation">
-<caption><span>Fields</span><span class="tabEnd"> </span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Field and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static java.lang.String</code></td>
-<td class="colLast"><code><strong><a
href="../../../../../org/apache/poi/hslf/dev/PPTXMLDump.html#CR">CR</a></strong></code> </td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>protected byte[]</code></td>
-<td class="colLast"><code><strong><a
href="../../../../../org/apache/poi/hslf/dev/PPTXMLDump.html#docstream">docstream</a></strong></code> </td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><strong><a
href="../../../../../org/apache/poi/hslf/dev/PPTXMLDump.html#HEADER_SIZE">HEADER_SIZE</a></strong></code> </td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>protected boolean</code></td>
-<td class="colLast"><code><strong><a
href="../../../../../org/apache/poi/hslf/dev/PPTXMLDump.html#hexHeader">hexHeader</a></strong></code> </td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>protected java.io.Writer</code></td>
-<td class="colLast"><code><strong><a
href="../../../../../org/apache/poi/hslf/dev/PPTXMLDump.html#out">out</a></strong></code> </td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><strong><a
href="../../../../../org/apache/poi/hslf/dev/PPTXMLDump.html#PICT_HEADER_SIZE">PICT_HEADER_SIZE</a></strong></code> </td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>protected byte[]</code></td>
-<td class="colLast"><code><strong><a
href="../../../../../org/apache/poi/hslf/dev/PPTXMLDump.html#pictstream">pictstream</a></strong></code> </td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static java.lang.String</code></td>
-<td class="colLast"><code><strong><a
href="../../../../../org/apache/poi/hslf/dev/PPTXMLDump.html#PICTURES_ENTRY">PICTURES_ENTRY</a></strong></code> </td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static java.lang.String</code></td>
-<td class="colLast"><code><strong><a
href="../../../../../org/apache/poi/hslf/dev/PPTXMLDump.html#PPDOC_ENTRY">PPDOC_ENTRY</a></strong></code> </td>
-</tr>
-</table>
-</li>
-</ul>
<!-- ======== CONSTRUCTOR SUMMARY ======== -->
<ul class="blockList">
<li class="blockList"><a name="constructor_summary">
@@ -227,99 +174,6 @@ extends java.lang.Object</pre>
<div class="details">
<ul class="blockList">
<li class="blockList">
-<!-- ============ FIELD DETAIL =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="field_detail">
-<!-- -->
-</a>
-<h3>Field Detail</h3>
-<a name="HEADER_SIZE">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>HEADER_SIZE</h4>
-<pre>public static final int HEADER_SIZE</pre>
-<dl><dt><span class="strong">See Also:</span></dt><dd><a
href="../../../../../constant-values.html#org.apache.poi.hslf.dev.PPTXMLDump.HEADER_SIZE">Constant
Field Values</a></dd></dl>
-</li>
-</ul>
-<a name="PICT_HEADER_SIZE">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>PICT_HEADER_SIZE</h4>
-<pre>public static final int PICT_HEADER_SIZE</pre>
-<dl><dt><span class="strong">See Also:</span></dt><dd><a
href="../../../../../constant-values.html#org.apache.poi.hslf.dev.PPTXMLDump.PICT_HEADER_SIZE">Constant
Field Values</a></dd></dl>
-</li>
-</ul>
-<a name="PPDOC_ENTRY">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>PPDOC_ENTRY</h4>
-<pre>public static final java.lang.String PPDOC_ENTRY</pre>
-<dl><dt><span class="strong">See Also:</span></dt><dd><a
href="../../../../../constant-values.html#org.apache.poi.hslf.dev.PPTXMLDump.PPDOC_ENTRY">Constant
Field Values</a></dd></dl>
-</li>
-</ul>
-<a name="PICTURES_ENTRY">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>PICTURES_ENTRY</h4>
-<pre>public static final java.lang.String PICTURES_ENTRY</pre>
-<dl><dt><span class="strong">See Also:</span></dt><dd><a
href="../../../../../constant-values.html#org.apache.poi.hslf.dev.PPTXMLDump.PICTURES_ENTRY">Constant
Field Values</a></dd></dl>
-</li>
-</ul>
-<a name="CR">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>CR</h4>
-<pre>public static final java.lang.String CR</pre>
-</li>
-</ul>
-<a name="out">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>out</h4>
-<pre>protected java.io.Writer out</pre>
-</li>
-</ul>
-<a name="docstream">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>docstream</h4>
-<pre>protected byte[] docstream</pre>
-</li>
-</ul>
-<a name="pictstream">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>pictstream</h4>
-<pre>protected byte[] pictstream</pre>
-</li>
-</ul>
-<a name="hexHeader">
-<!-- -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>hexHeader</h4>
-<pre>protected boolean hexHeader</pre>
-</li>
-</ul>
-</li>
-</ul>
<!-- ========= CONSTRUCTOR DETAIL ======== -->
<ul class="blockList">
<li class="blockList"><a name="constructor_detail">
@@ -456,13 +310,13 @@ extends java.lang.Object</pre>
<ul class="subNavList">
<li>Summary: </li>
<li>Nested | </li>
-<li><a href="#field_summary">Field</a> | </li>
+<li>Field | </li>
<li><a href="#constructor_summary">Constr</a> | </li>
<li><a href="#method_summary">Method</a></li>
</ul>
<ul class="subNavList">
<li>Detail: </li>
-<li><a href="#field_detail">Field</a> | </li>
+<li>Field | </li>
<li><a href="#constructor_detail">Constr</a> | </li>
<li><a href="#method_detail">Method</a></li>
</ul>
Modified:
poi/site/publish/apidocs/org/apache/poi/poifs/crypt/CryptoFunctions.html
URL:
http://svn.apache.org/viewvc/poi/site/publish/apidocs/org/apache/poi/poifs/crypt/CryptoFunctions.html?rev=1734859&r1=1734858&r2=1734859&view=diff
==============================================================================
--- poi/site/publish/apidocs/org/apache/poi/poifs/crypt/CryptoFunctions.html
(original)
+++ poi/site/publish/apidocs/org/apache/poi/poifs/crypt/CryptoFunctions.html
Sun Mar 13 21:20:00 2016
@@ -94,7 +94,8 @@
<li class="blockList">
<hr>
<br>
-<pre>public class <span class="strong">CryptoFunctions</span>
+<pre><a href="../../../../../org/apache/poi/util/Internal.html"
title="annotation in org.apache.poi.util">@Internal</a>
+public class <span class="strong">CryptoFunctions</span>
extends java.lang.Object</pre>
<div class="block">Helper functions used for standard and agile
encryption</div>
</li>
@@ -162,9 +163,7 @@ extends java.lang.Object</pre>
byte[] salt,
byte[] blockKey,
int blockSize)</code>
-<div class="block">2.3.4.12 Initialization Vector Generation (Agile Encryption)
-
- Initialization vectors are used in all cases for agile encryption.</div>
+<div class="block"><cite>2.3.4.12 Initialization Vector Generation (Agile
Encryption)</cite></div>
</td>
</tr>
<tr class="rowColor">
@@ -173,9 +172,7 @@ extends java.lang.Object</pre>
<a
href="../../../../../org/apache/poi/poifs/crypt/HashAlgorithm.html" title="enum
in org.apache.poi.poifs.crypt">HashAlgorithm</a> hashAlgorithm,
byte[] blockKey,
int keySize)</code>
-<div class="block">2.3.4.11 Encryption Key Generation (Agile Encryption)
-
- ...</div>
+<div class="block"><cite>2.3.4.11 Encryption Key Generation (Agile
Encryption)</cite></div>
</td>
</tr>
<tr class="altColor">
@@ -186,13 +183,6 @@ extends java.lang.Object</pre>
</td>
</tr>
<tr class="rowColor">
-<td class="colFirst"><code>static byte[]</code></td>
-<td class="colLast"><code><strong><a
href="../../../../../org/apache/poi/poifs/crypt/CryptoFunctions.html#getBlock36(byte[],%20int)">getBlock36</a></strong>(byte[] hash,
- int size)</code>
-<div class="block">Returns a new byte array with a truncated to the given
size.</div>
-</td>
-</tr>
-<tr class="altColor">
<td class="colFirst"><code>static javax.crypto.Cipher</code></td>
<td class="colLast"><code><strong><a
href="../../../../../org/apache/poi/poifs/crypt/CryptoFunctions.html#getCipher(java.security.Key,%20org.apache.poi.poifs.crypt.CipherAlgorithm,%20org.apache.poi.poifs.crypt.ChainingMode,%20byte[],%20int,%20java.lang.String)">getCipher</a></strong>(java.security.Key key,
<a
href="../../../../../org/apache/poi/poifs/crypt/CipherAlgorithm.html"
title="enum in
org.apache.poi.poifs.crypt">CipherAlgorithm</a> cipherAlgorithm,
@@ -205,37 +195,37 @@ extends java.lang.Object</pre>
provider.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>static javax.crypto.Cipher</code></td>
<td class="colLast"><code><strong><a
href="../../../../../org/apache/poi/poifs/crypt/CryptoFunctions.html#getCipher(javax.crypto.SecretKey,%20org.apache.poi.poifs.crypt.CipherAlgorithm,%20org.apache.poi.poifs.crypt.ChainingMode,%20byte[],%20int)">getCipher</a></strong>(javax.crypto.SecretKey key,
<a
href="../../../../../org/apache/poi/poifs/crypt/CipherAlgorithm.html"
title="enum in
org.apache.poi.poifs.crypt">CipherAlgorithm</a> cipherAlgorithm,
<a href="../../../../../org/apache/poi/poifs/crypt/ChainingMode.html"
title="enum in org.apache.poi.poifs.crypt">ChainingMode</a> chain,
byte[] vec,
- int cipherMode)</code> </td>
+ int cipherMode)</code>
+<div class="block">Initialize a new cipher object with the given cipher
properties and no padding
+ If the given algorithm is not implemented in the JCE, it will try to load it
from the bouncy castle
+ provider.</div>
+</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>static javax.crypto.Mac</code></td>
<td class="colLast"><code><strong><a
href="../../../../../org/apache/poi/poifs/crypt/CryptoFunctions.html#getMac(org.apache.poi.poifs.crypt.HashAlgorithm)">getMac</a></strong>(<a
href="../../../../../org/apache/poi/poifs/crypt/HashAlgorithm.html"
title="enum in
org.apache.poi.poifs.crypt">HashAlgorithm</a> hashAlgorithm)</code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>static java.security.MessageDigest</code></td>
<td class="colLast"><code><strong><a
href="../../../../../org/apache/poi/poifs/crypt/CryptoFunctions.html#getMessageDigest(org.apache.poi.poifs.crypt.HashAlgorithm)">getMessageDigest</a></strong>(<a
href="../../../../../org/apache/poi/poifs/crypt/HashAlgorithm.html"
title="enum in
org.apache.poi.poifs.crypt">HashAlgorithm</a> hashAlgorithm)</code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>static byte[]</code></td>
<td class="colLast"><code><strong><a
href="../../../../../org/apache/poi/poifs/crypt/CryptoFunctions.html#hashPassword(java.lang.String,%20org.apache.poi.poifs.crypt.HashAlgorithm,%20byte[],%20int)">hashPassword</a></strong>(java.lang.String password,
<a
href="../../../../../org/apache/poi/poifs/crypt/HashAlgorithm.html" title="enum
in org.apache.poi.poifs.crypt">HashAlgorithm</a> hashAlgorithm,
byte[] salt,
int spinCount)</code>
-<div class="block">2.3.4.7 ECMA-376 Document Encryption Key Generation
(Standard Encryption)
- 2.3.4.11 Encryption Key Generation (Agile Encryption)
-
- The encryption key for ECMA-376 document encryption [ECMA-376] using agile
encryption MUST be
- generated by using the following method, which is derived from PKCS #5:
Password-Based
- Cryptography Version 2.0 [RFC2898].</div>
+<div class="block"><cite>2.3.4.7 ECMA-376 Document Encryption Key Generation
(Standard Encryption)<br/>
+ 2.3.4.11 Encryption Key Generation (Agile Encryption)</cite></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>static byte[]</code></td>
<td class="colLast"><code><strong><a
href="../../../../../org/apache/poi/poifs/crypt/CryptoFunctions.html#hashPassword(java.lang.String,%20org.apache.poi.poifs.crypt.HashAlgorithm,%20byte[],%20int,%20boolean)">hashPassword</a></strong>(java.lang.String password,
<a
href="../../../../../org/apache/poi/poifs/crypt/HashAlgorithm.html" title="enum
in org.apache.poi.poifs.crypt">HashAlgorithm</a> hashAlgorithm,
@@ -245,17 +235,17 @@ extends java.lang.Object</pre>
<div class="block">Generalized method for read and write protection hash
generation.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>static void</code></td>
<td class="colLast"><code><strong><a
href="../../../../../org/apache/poi/poifs/crypt/CryptoFunctions.html#registerBouncyCastle()">registerBouncyCastle</a></strong>()</code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>static java.lang.String</code></td>
<td class="colLast"><code><strong><a
href="../../../../../org/apache/poi/poifs/crypt/CryptoFunctions.html#xorHashPassword(java.lang.String)">xorHashPassword</a></strong>(java.lang.String password)</code>
<div class="block">This method generates the xored-hashed password for word
documents < 2007.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>static java.lang.String</code></td>
<td class="colLast"><code><strong><a
href="../../../../../org/apache/poi/poifs/crypt/CryptoFunctions.html#xorHashPasswordReversed(java.lang.String)">xorHashPasswordReversed</a></strong>(java.lang.String password)</code>
<div class="block">Convenience function which returns the reversed
xored-hashed password for further
@@ -311,32 +301,33 @@ extends java.lang.Object</pre>
<a
href="../../../../../org/apache/poi/poifs/crypt/HashAlgorithm.html" title="enum
in org.apache.poi.poifs.crypt">HashAlgorithm</a> hashAlgorithm,
byte[] salt,
int spinCount)</pre>
-<div class="block">2.3.4.7 ECMA-376 Document Encryption Key Generation
(Standard Encryption)
- 2.3.4.11 Encryption Key Generation (Agile Encryption)
+<div class="block"><p><cite>2.3.4.7 ECMA-376 Document Encryption Key
Generation (Standard Encryption)<br/>
+ 2.3.4.11 Encryption Key Generation (Agile Encryption)</cite></p>
- The encryption key for ECMA-376 document encryption [ECMA-376] using agile
encryption MUST be
- generated by using the following method, which is derived from PKCS #5:
Password-Based
- Cryptography Version 2.0 [RFC2898].
+ <p>The encryption key for ECMA-376 document encryption [ECMA-376] using agile
+ encryption MUST be generated by using the following method, which is derived
from PKCS #5:
+ <a href="https://www.ietf.org/rfc/rfc2898.txt";>Password-Based Cryptography
Version 2.0 [RFC2898]</a>.</p>
- Let H() be a hashing algorithm as determined by the
PasswordKeyEncryptor.hashAlgorithm
- element, H_n be the hash data of the n-th iteration, and a plus sign (+)
represent concatenation. The
- password MUST be provided as an array of Unicode characters. Limitations on
the length of the
- password and the characters used by the password are
implementation-dependent. The initial
- password hash is generated as follows:
+ <p>Let H() be a hashing algorithm as determined by the
PasswordKeyEncryptor.hashAlgorithm
+ element, H_n be the hash data of the n-th iteration, and a plus sign (+)
represent concatenation.
+ The password MUST be provided as an array of Unicode characters. Limitations
on the length of the
+ password and the characters used by the password are implementation-dependent.
+ The initial password hash is generated as follows:</p>
- - H_0 = H(salt + password)
- The salt used MUST be generated randomly. The salt MUST be stored in the
- PasswordKeyEncryptor.saltValue element contained within the \EncryptionInfo
stream (1) as
- specified in section 2.3.4.10. The hash is then iterated by using the
following approach:
+ <pre>H_0 = H(salt + password)</pre>
- - H_n = H(iterator + H_n-1)
+ <p>The salt used MUST be generated randomly. The salt MUST be stored in the
+ PasswordKeyEncryptor.saltValue element contained within the \EncryptionInfo
stream as
+ specified in section 2.3.4.10. The hash is then iterated by using the
following approach:</p>
- where iterator is an unsigned 32-bit value that is initially set to
0x00000000 and then incremented
+ <pre>H_n = H(iterator + H_n-1)</pre>
+
+ <p>where iterator is an unsigned 32-bit value that is initially set to
0x00000000 and then incremented
monotonically on each iteration until PasswordKey.spinCount iterations have
been performed.
- The value of iterator on the last iteration MUST be one less than
PasswordKey.spinCount.
+ The value of iterator on the last iteration MUST be one less than
PasswordKey.spinCount.</p>
- For POI, H_final will be calculated by <a
href="../../../../../org/apache/poi/poifs/crypt/CryptoFunctions.html#generateKey(byte[],%20org.apache.poi.poifs.crypt.HashAlgorithm,%20byte[],%20int)"><code>generateKey(byte[],HashAlgorithm,byte[],int)</code></a></div>
+ <p>For POI, H_final will be calculated by <a
href="../../../../../org/apache/poi/poifs/crypt/CryptoFunctions.html#generateKey(byte[],%20org.apache.poi.poifs.crypt.HashAlgorithm,%20byte[],%20int)"><code>generateKey(byte[],HashAlgorithm,byte[],int)</code></a></p></div>
<dl><dt><span class="strong">Parameters:</span></dt><dd><code>password</code>
- </dd><dd><code>hashAlgorithm</code> - </dd><dd><code>salt</code> -
</dd><dd><code>spinCount</code> - </dd>
<dt><span class="strong">Returns:</span></dt><dd>the hashed password</dd></dl>
</li>
@@ -370,19 +361,21 @@ extends java.lang.Object</pre>
byte[] salt,
byte[] blockKey,
int blockSize)</pre>
-<div class="block">2.3.4.12 Initialization Vector Generation (Agile Encryption)
+<div class="block"><p><cite>2.3.4.12 Initialization Vector Generation (Agile
Encryption)</cite></p>
- Initialization vectors are used in all cases for agile encryption. An
initialization vector MUST be
+ <p>Initialization vectors are used in all cases for agile encryption. An
initialization vector MUST be
generated by using the following method, where H() is a hash function that
MUST be the same as
- specified in section 2.3.4.11 and a plus sign (+) represents concatenation:
- 1. If a blockKey is provided, let IV be a hash of the KeySalt and the
following value:
- blockKey: IV = H(KeySalt + blockKey)
- 2. If a blockKey is not provided, let IV be equal to the following value:
- KeySalt:IV = KeySalt.
- 3. If the number of bytes in the value of IV is less than the the value of
the blockSize attribute
- corresponding to the cipherAlgorithm attribute, pad the array of bytes by
appending 0x36 until
- the array is blockSize bytes. If the array of bytes is larger than
blockSize bytes, truncate the
- array to blockSize bytes.</div>
+ specified in section 2.3.4.11 and a plus sign (+) represents
concatenation:</p>
+ <ul>
+ <li>If a blockKey is provided, let IV be a hash of the KeySalt and the
following value:<br/>
+ <code>blockKey: IV = H(KeySalt + blockKey)</code></li>
+ <li>If a blockKey is not provided, let IV be equal to the following
value:<br/>
+ <code>KeySalt:IV = KeySalt</code></li>
+ <li>If the number of bytes in the value of IV is less than the the value of
the blockSize attribute
+ corresponding to the cipherAlgorithm attribute, pad the array of bytes by
appending 0x36 until
+ the array is blockSize bytes. If the array of bytes is larger than
blockSize bytes, truncate the
+ array to blockSize bytes.</li>
+ </ul></div>
</li>
</ul>
<a name="generateKey(byte[], org.apache.poi.poifs.crypt.HashAlgorithm, byte[],
int)">
@@ -395,21 +388,19 @@ extends java.lang.Object</pre>
<a
href="../../../../../org/apache/poi/poifs/crypt/HashAlgorithm.html" title="enum
in org.apache.poi.poifs.crypt">HashAlgorithm</a> hashAlgorithm,
byte[] blockKey,
int keySize)</pre>
-<div class="block">2.3.4.11 Encryption Key Generation (Agile Encryption)
-
- ... continued ...
+<div class="block"><p><cite>2.3.4.11 Encryption Key Generation (Agile
Encryption)</cite></p>
- The final hash data that is used for an encryption key is then generated by
using the following
- method:
+ <p>The final hash data that is used for an encryption key is then generated
by using the following
+ method:</p>
- - H_final = H(H_n + blockKey)
+ <pre>H_final = H(H_n + blockKey)</pre>
- where blockKey represents an array of bytes used to prevent two different
blocks from encrypting
- to the same cipher text.
+ <p>where blockKey represents an array of bytes used to prevent two different
blocks from encrypting
+ to the same cipher text.</p>
- If the size of the resulting H_final is smaller than that of
PasswordKeyEncryptor.keyBits, the key
+ <p>If the size of the resulting H_final is smaller than that of
PasswordKeyEncryptor.keyBits, the key
MUST be padded by appending bytes with a value of 0x36. If the hash value is
larger in size than
- PasswordKeyEncryptor.keyBits, the key is obtained by truncating the hash
value.</div>
+ PasswordKeyEncryptor.keyBits, the key is obtained by truncating the hash
value.</p></div>
<dl><dt><span
class="strong">Parameters:</span></dt><dd><code>passwordHash</code> -
</dd><dd><code>hashAlgorithm</code> - </dd><dd><code>blockKey</code> -
</dd><dd><code>keySize</code> - </dd>
<dt><span class="strong">Returns:</span></dt><dd>intermediate key</dd></dl>
</li>
@@ -425,6 +416,15 @@ extends java.lang.Object</pre>
<a
href="../../../../../org/apache/poi/poifs/crypt/ChainingMode.html" title="enum
in org.apache.poi.poifs.crypt">ChainingMode</a> chain,
byte[] vec,
int cipherMode)</pre>
+<div class="block">Initialize a new cipher object with the given cipher
properties and no padding
+ If the given algorithm is not implemented in the JCE, it will try to load it
from the bouncy castle
+ provider.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>key</code> - the
secrect key</dd><dd><code>cipherAlgorithm</code> - the cipher
algorithm</dd><dd><code>chain</code> - the chaining
mode</dd><dd><code>vec</code> - the initialization vector (IV), can be
null</dd><dd><code>cipherMode</code> - Cipher.DECRYPT_MODE or
Cipher.ENCRYPT_MODE</dd>
+<dt><span class="strong">Returns:</span></dt><dd>the requested cipher</dd>
+<dt><span class="strong">Throws:</span></dt>
+<dd><code>java.security.GeneralSecurityException</code></dd>
+<dd><code><a
href="../../../../../org/apache/poi/EncryptedDocumentException.html"
title="class in org.apache.poi">EncryptedDocumentException</a></code> - if the
initialization failed or if an algorithm was specified,
+ which depends on a missing bouncy castle provider</dd></dl>
</li>
</ul>
<a name="getCipher(java.security.Key,
org.apache.poi.poifs.crypt.CipherAlgorithm,
org.apache.poi.poifs.crypt.ChainingMode, byte[], int, java.lang.String)">
@@ -442,7 +442,7 @@ extends java.lang.Object</pre>
<div class="block">Initialize a new cipher object with the given cipher
properties
If the given algorithm is not implemented in the JCE, it will try to load it
from the bouncy castle
provider.</div>
-<dl><dt><span class="strong">Parameters:</span></dt><dd><code>key</code> - the
secrect key</dd><dd><code>cipherAlgorithm</code> - the cipher
algorithm</dd><dd><code>chain</code> - the chaining
mode</dd><dd><code>vec</code> - the initialization vector (IV), can be
null</dd><dd><code>cipherMode</code> - Cipher.DECRYPT_MODE or
Cipher.ENCRYPT_MODE</dd><dd><code>padding</code> - </dd>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>key</code> - the
secrect key</dd><dd><code>cipherAlgorithm</code> - the cipher
algorithm</dd><dd><code>chain</code> - the chaining
mode</dd><dd><code>vec</code> - the initialization vector (IV), can be
null</dd><dd><code>cipherMode</code> - Cipher.DECRYPT_MODE or
Cipher.ENCRYPT_MODE</dd><dd><code>padding</code> - the padding (null =
NOPADDING, ANSIX923Padding, PKCS5Padding, PKCS7Padding, ISO10126Padding,
...)</dd>
<dt><span class="strong">Returns:</span></dt><dd>the requested cipher</dd>
<dt><span class="strong">Throws:</span></dt>
<dd><code>java.security.GeneralSecurityException</code></dd>
@@ -450,20 +450,6 @@ extends java.lang.Object</pre>
which depends on a missing bouncy castle provider</dd></dl>
</li>
</ul>
-<a name="getBlock36(byte[], int)">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getBlock36</h4>
-<pre>public static byte[] getBlock36(byte[] hash,
- int size)</pre>
-<div class="block">Returns a new byte array with a truncated to the given
size.
- If the hash has less then size bytes, it will be filled with 0x36-bytes</div>
-<dl><dt><span class="strong">Parameters:</span></dt><dd><code>hash</code> -
the to be truncated/filled hash byte array</dd><dd><code>size</code> - the size
of the returned byte array</dd>
-<dt><span class="strong">Returns:</span></dt><dd>the padded hash</dd></dl>
-</li>
-</ul>
<a name="getBlock0(byte[], int)">
<!-- -->
</a>
@@ -505,6 +491,20 @@ extends java.lang.Object</pre>
<pre>public static void registerBouncyCastle()</pre>
</li>
</ul>
+<a name="createXorVerifier1(java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>createXorVerifier1</h4>
+<pre>public
static int createXorVerifier1(java.lang.String password)</pre>
+<div class="block">Create the verifier for xor obfuscation (method 1)</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>password</code>
- the password</dd>
+<dt><span class="strong">Returns:</span></dt><dd>the verifier (actually a
short value)</dd><dt><span class="strong">See Also:</span></dt><dd><a
href="http://msdn.microsoft.com/en-us/library/dd926947.aspx";>2.3.7.1 Binary
Document Password Verifier Derivation Method 1</a>,
+<a href="http://msdn.microsoft.com/en-us/library/dd905229.aspx";>2.3.7.4 Binary
Document Password Verifier Derivation Method 2</a>,
+<a href="http://www.ecma-international.org/news/TC45_current_work/Office Open
XML Part 4 - Markup Language Reference.pdf">Part 4 - Markup Language Reference
- Ecma International - 3.2.12 fileSharing</a></dd></dl>
+</li>
+</ul>
<a name="createXorVerifier2(java.lang.String)">
<!-- -->
</a>
@@ -542,19 +542,6 @@ extends java.lang.Object</pre>
processing in word documents 2007 and newer, which utilize a real hashing
algorithm like sha1.</div>
</li>
</ul>
-<a name="createXorVerifier1(java.lang.String)">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>createXorVerifier1</h4>
-<pre>public
static int createXorVerifier1(java.lang.String password)</pre>
-<div class="block">Create the verifier for xor obfuscation (method 1)</div>
-<dl><dt><span class="strong">Parameters:</span></dt><dd><code>password</code>
- the password</dd>
-<dt><span class="strong">Returns:</span></dt><dd>the verifier (actually a
short value)</dd><dt><span class="strong">See Also:</span></dt><dd><a
href="http://msdn.microsoft.com/en-us/library/dd926947.aspx";>2.3.7.1 Binary
Document Password Verifier Derivation Method 1</a>,
-<a href="http://msdn.microsoft.com/en-us/library/dd905229.aspx";>2.3.7.4 Binary
Document Password Verifier Derivation Method 2</a></dd></dl>
-</li>
-</ul>
<a name="createXorKey1(java.lang.String)">
<!-- -->
</a>
Modified:
poi/site/publish/apidocs/org/apache/poi/poifs/crypt/class-use/ChainingMode.html
URL:
http://svn.apache.org/viewvc/poi/site/publish/apidocs/org/apache/poi/poifs/crypt/class-use/ChainingMode.html?rev=1734859&r1=1734858&r2=1734859&view=diff
==============================================================================
---
poi/site/publish/apidocs/org/apache/poi/poifs/crypt/class-use/ChainingMode.html
(original)
+++
poi/site/publish/apidocs/org/apache/poi/poifs/crypt/class-use/ChainingMode.html
Sun Mar 13 21:20:00 2016
@@ -160,7 +160,11 @@ the order they are declared.</div>
<a
href="../../../../../../org/apache/poi/poifs/crypt/CipherAlgorithm.html"
title="enum in
org.apache.poi.poifs.crypt">CipherAlgorithm</a> cipherAlgorithm,
<a
href="../../../../../../org/apache/poi/poifs/crypt/ChainingMode.html"
title="enum in org.apache.poi.poifs.crypt">ChainingMode</a> chain,
byte[] vec,
- int cipherMode)</code> </td>
+ int cipherMode)</code>
+<div class="block">Initialize a new cipher object with the given cipher
properties and no padding
+ If the given algorithm is not implemented in the JCE, it will try to load it
from the bouncy castle
+ provider.</div>
+</td>
</tr>
<tr class="altColor">
<td class="colFirst"><code>void</code></td>
Modified:
poi/site/publish/apidocs/org/apache/poi/poifs/crypt/class-use/CipherAlgorithm.html
URL:
http://svn.apache.org/viewvc/poi/site/publish/apidocs/org/apache/poi/poifs/crypt/class-use/CipherAlgorithm.html?rev=1734859&r1=1734858&r2=1734859&view=diff
==============================================================================
---
poi/site/publish/apidocs/org/apache/poi/poifs/crypt/class-use/CipherAlgorithm.html
(original)
+++
poi/site/publish/apidocs/org/apache/poi/poifs/crypt/class-use/CipherAlgorithm.html
Sun Mar 13 21:20:00 2016
@@ -169,7 +169,11 @@ the order they are declared.</div>
<a
href="../../../../../../org/apache/poi/poifs/crypt/CipherAlgorithm.html"
title="enum in
org.apache.poi.poifs.crypt">CipherAlgorithm</a> cipherAlgorithm,
<a
href="../../../../../../org/apache/poi/poifs/crypt/ChainingMode.html"
title="enum in org.apache.poi.poifs.crypt">ChainingMode</a> chain,
byte[] vec,
- int cipherMode)</code> </td>
+ int cipherMode)</code>
+<div class="block">Initialize a new cipher object with the given cipher
properties and no padding
+ If the given algorithm is not implemented in the JCE, it will try to load it
from the bouncy castle
+ provider.</div>
+</td>
</tr>
<tr class="altColor">
<td class="colFirst"><code>void</code></td>
Modified:
poi/site/publish/apidocs/org/apache/poi/poifs/crypt/class-use/HashAlgorithm.html
URL:
http://svn.apache.org/viewvc/poi/site/publish/apidocs/org/apache/poi/poifs/crypt/class-use/HashAlgorithm.html?rev=1734859&r1=1734858&r2=1734859&view=diff
==============================================================================
---
poi/site/publish/apidocs/org/apache/poi/poifs/crypt/class-use/HashAlgorithm.html
(original)
+++
poi/site/publish/apidocs/org/apache/poi/poifs/crypt/class-use/HashAlgorithm.html
Sun Mar 13 21:20:00 2016
@@ -183,9 +183,7 @@ the order they are declared.</div>
byte[] salt,
byte[] blockKey,
int blockSize)</code>
-<div class="block">2.3.4.12 Initialization Vector Generation (Agile Encryption)
-
- Initialization vectors are used in all cases for agile encryption.</div>
+<div class="block"><cite>2.3.4.12 Initialization Vector Generation (Agile
Encryption)</cite></div>
</td>
</tr>
<tr class="rowColor">
@@ -194,9 +192,7 @@ the order they are declared.</div>
<a
href="../../../../../../org/apache/poi/poifs/crypt/HashAlgorithm.html"
title="enum in org.apache.poi.poifs.crypt">HashAlgorithm</a> hashAlgorithm,
byte[] blockKey,
int keySize)</code>
-<div class="block">2.3.4.11 Encryption Key Generation (Agile Encryption)
-
- ...</div>
+<div class="block"><cite>2.3.4.11 Encryption Key Generation (Agile
Encryption)</cite></div>
</td>
</tr>
<tr class="altColor">
@@ -213,12 +209,8 @@ the order they are declared.</div>
<a
href="../../../../../../org/apache/poi/poifs/crypt/HashAlgorithm.html"
title="enum in org.apache.poi.poifs.crypt">HashAlgorithm</a> hashAlgorithm,
byte[] salt,
int spinCount)</code>
-<div class="block">2.3.4.7 ECMA-376 Document Encryption Key Generation
(Standard Encryption)
- 2.3.4.11 Encryption Key Generation (Agile Encryption)
-
- The encryption key for ECMA-376 document encryption [ECMA-376] using agile
encryption MUST be
- generated by using the following method, which is derived from PKCS #5:
Password-Based
- Cryptography Version 2.0 [RFC2898].</div>
+<div class="block"><cite>2.3.4.7 ECMA-376 Document Encryption Key Generation
(Standard Encryption)<br/>
+ 2.3.4.11 Encryption Key Generation (Agile Encryption)</cite></div>
</td>
</tr>
<tr class="rowColor">
Modified: poi/site/publish/apidocs/org/apache/poi/util/TempFile.html
URL:
http://svn.apache.org/viewvc/poi/site/publish/apidocs/org/apache/poi/util/TempFile.html?rev=1734859&r1=1734858&r2=1734859&view=diff
==============================================================================
--- poi/site/publish/apidocs/org/apache/poi/util/TempFile.html (original)
+++ poi/site/publish/apidocs/org/apache/poi/util/TempFile.html Sun Mar 13
21:20:00 2016
@@ -60,13 +60,13 @@
<ul class="subNavList">
<li>Summary: </li>
<li><a href="#nested_class_summary">Nested</a> | </li>
-<li>Field | </li>
+<li><a href="#field_summary">Field</a> | </li>
<li><a href="#constructor_summary">Constr</a> | </li>
<li><a href="#method_summary">Method</a></li>
</ul>
<ul class="subNavList">
<li>Detail: </li>
-<li>Field | </li>
+<li><a href="#field_detail">Field</a> | </li>
<li><a href="#constructor_detail">Constr</a> | </li>
<li><a href="#method_detail">Method</a></li>
</ul>
@@ -125,6 +125,27 @@ extends java.lang.Object</pre>
</table>
</li>
</ul>
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field_summary">
+<!-- -->
+</a>
+<h3>Field Summary</h3>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0"
summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static java.lang.String</code></td>
+<td class="colLast"><code><strong><a
href="../../../../org/apache/poi/util/TempFile.html#JAVA_IO_TMPDIR">JAVA_IO_TMPDIR</a></strong></code>
+<div class="block">Define a constant for this property as it is sometimes
mistypes as "tempdir" otherwise</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
<!-- ======== CONSTRUCTOR SUMMARY ======== -->
<ul class="blockList">
<li class="blockList"><a name="constructor_summary">
@@ -183,6 +204,25 @@ extends java.lang.Object</pre>
<div class="details">
<ul class="blockList">
<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field_detail">
+<!-- -->
+</a>
+<h3>Field Detail</h3>
+<a name="JAVA_IO_TMPDIR">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>JAVA_IO_TMPDIR</h4>
+<pre>public static final java.lang.String JAVA_IO_TMPDIR</pre>
+<div class="block">Define a constant for this property as it is sometimes
mistypes as "tempdir" otherwise</div>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a
href="../../../../constant-values.html#org.apache.poi.util.TempFile.JAVA_IO_TMPDIR">Constant
Field Values</a></dd></dl>
+</li>
+</ul>
+</li>
+</ul>
<!-- ========= CONSTRUCTOR DETAIL ======== -->
<ul class="blockList">
<li class="blockList"><a name="constructor_detail">
@@ -291,13 +331,13 @@ extends java.lang.Object</pre>
<ul class="subNavList">
<li>Summary: </li>
<li><a href="#nested_class_summary">Nested</a> | </li>
-<li>Field | </li>
+<li><a href="#field_summary">Field</a> | </li>
<li><a href="#constructor_summary">Constr</a> | </li>
<li><a href="#method_summary">Method</a></li>
</ul>
<ul class="subNavList">
<li>Detail: </li>
-<li>Field | </li>
+<li><a href="#field_detail">Field</a> | </li>
<li><a href="#constructor_detail">Constr</a> | </li>
<li><a href="#method_detail">Method</a></li>
</ul>
Modified: poi/site/publish/apidocs/org/apache/poi/util/class-use/Internal.html
URL:
http://svn.apache.org/viewvc/poi/site/publish/apidocs/org/apache/poi/util/class-use/Internal.html?rev=1734859&r1=1734858&r2=1734859&view=diff
==============================================================================
--- poi/site/publish/apidocs/org/apache/poi/util/class-use/Internal.html
(original)
+++ poi/site/publish/apidocs/org/apache/poi/util/class-use/Internal.html Sun
Mar 13 21:20:00 2016
@@ -10009,6 +10009,12 @@ Compound Document Format.</div>
<td class="colFirst"><code>class </code></td>
<td class="colLast"><code><strong><a
href="../../../../../org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.html"
title="class in
org.apache.poi.poifs.crypt">ChunkedCipherOutputStream</a></strong></code> </td>
</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class </code></td>
+<td class="colLast"><code><strong><a
href="../../../../../org/apache/poi/poifs/crypt/CryptoFunctions.html"
title="class in org.apache.poi.poifs.crypt">CryptoFunctions</a></strong></code>
+<div class="block">Helper functions used for standard and agile
encryption</div>
+</td>
+</tr>
</tbody>
</table>
</li>
Modified: poi/site/publish/changes.html
URL:
http://svn.apache.org/viewvc/poi/site/publish/changes.html?rev=1734859&r1=1734858&r2=1734859&view=diff
==============================================================================
--- poi/site/publish/changes.html (original)
+++ poi/site/publish/changes.html Sun Mar 13 21:20:00 2016
@@ -265,6 +265,9 @@ if (VERSION > 3) {
<ul>
<li>
+<img class="icon" alt="fix" src="images/fix.jpg"> <a
href="https://bz.apache.org/bugzilla/show_bug.cgi?id=59135";>59135</a> -
Password gets truncated when using passwords longer than 15 characters for the
function protectSheet()</li>
+
+<li>
<img class="icon" alt="add" src="images/add.jpg"> <a
href="https://bz.apache.org/bugzilla/show_bug.cgi?id=56549";>56549</a> -
Correctly calculate char index ranges for HWPF in the TextPieceTable</li>
<li>
Modified: poi/site/publish/changes.rss
URL:
http://svn.apache.org/viewvc/poi/site/publish/changes.rss?rev=1734859&r1=1734858&r2=1734859&view=diff
==============================================================================
--- poi/site/publish/changes.rss (original)
+++ poi/site/publish/changes.rss Sun Mar 13 21:20:00 2016
@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE rss PUBLIC "-//Netscape Communications//DTD RSS 0.91//EN"
"http://my.netscape.com/publish/formats/rss-0.91.dtd";>
-<rss version="0.91"><channel><title>Apache POI
Changes</title><link>http://poi.apache.org/changes.html</link><description>Apache
POI Changes</description><language>en-us</language><item><title> add(bug
56549)</title><link>http://poi.apache.org/changes.html</link><description> add
by POI Developers (bug 56549) - Correctly calculate char index ranges for HWPF
in the TextPieceTable</description></item><item><title> add(bug
57495)</title><link>http://poi.apache.org/changes.html</link><description> add
by POI Developers (bug 57495) - Fix problem with tables in documents at pos
0</description></item><item><title>
fix</title><link>http://poi.apache.org/changes.html</link><description> fix by
POI Developers - Fix a number of edge-cases where file-handles would be
leaked</description></item><item><title> fix(bug
59170)</title><link>http://poi.apache.org/changes.html</link><description> fix
by POI Developers (bug 59170) - Remove deprecated classes (POI 3.15) -
*Workbook.setRepeatingRowsAndCol
umns()</description></item><item><title> fix(bug
59170)</title><link>http://poi.apache.org/changes.html</link><description> fix
by POI Developers (bug 59170) - Remove deprecated classes (POI 3.15) -
org.apache.poi.hssf/ss.util.Region</description></item><item><title> add(bug
57031)</title><link>http://poi.apache.org/changes.html</link><description> add
by POI Developers (bug 57031) - Out of Memory when extracting text from
attached files</description></item><item><title>
fix</title><link>http://poi.apache.org/changes.html</link><description> fix by
POI Developers - More helpful exception when POIFSFileSystem is given a raw XML
file</description></item></channel></rss>
\ No newline at end of file
+<rss version="0.91"><channel><title>Apache POI
Changes</title><link>http://poi.apache.org/changes.html</link><description>Apache
POI Changes</description><language>en-us</language><item><title> fix(bug
59135)</title><link>http://poi.apache.org/changes.html</link><description> fix
by POI Developers (bug 59135) - Password gets truncated when using passwords
longer than 15 characters for the function
protectSheet()</description></item><item><title> add(bug
56549)</title><link>http://poi.apache.org/changes.html</link><description> add
by POI Developers (bug 56549) - Correctly calculate char index ranges for HWPF
in the TextPieceTable</description></item><item><title> add(bug
57495)</title><link>http://poi.apache.org/changes.html</link><description> add
by POI Developers (bug 57495) - Fix problem with tables in documents at pos
0</description></item><item><title>
fix</title><link>http://poi.apache.org/changes.html</link><description> fix by
POI Developers - Fix a number of edge-cases whe
re file-handles would be leaked</description></item><item><title> fix(bug
59170)</title><link>http://poi.apache.org/changes.html</link><description> fix
by POI Developers (bug 59170) - Remove deprecated classes (POI 3.15) -
*Workbook.setRepeatingRowsAndColumns()</description></item><item><title>
fix(bug
59170)</title><link>http://poi.apache.org/changes.html</link><description> fix
by POI Developers (bug 59170) - Remove deprecated classes (POI 3.15) -
org.apache.poi.hssf/ss.util.Region</description></item><item><title> add(bug
57031)</title><link>http://poi.apache.org/changes.html</link><description> add
by POI Developers (bug 57031) - Out of Memory when extracting text from
attached files</description></item><item><title>
fix</title><link>http://poi.apache.org/changes.html</link><description> fix by
POI Developers - More helpful exception when POIFSFileSystem is given a raw XML
file</description></item></channel></rss>
\ No newline at end of file
Modified: poi/site/publish/download.html
URL:
http://svn.apache.org/viewvc/poi/site/publish/download.html?rev=1734859&r1=1734858&r2=1734859&view=diff
==============================================================================
--- poi/site/publish/download.html (original)
+++ poi/site/publish/download.html Sun Mar 13 21:20:00 2016
@@ -539,7 +539,7 @@ sub 4096g/7B45A98A 2007-06-18 [expires
</div>
<p>
- Apache POI became a top level project in June 2007 and POI 3.0
artefacts were re-released.
+ Apache POI became a top level project in June 2007 and POI 3.0
artifacts were re-released.
Prior to that date POI was a sub-project of <a
href="http://jakarta.apache.org/";>Apache Jakarta.</a>
</p>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
