Author: kiwiwings
Date: Mon Jul 13 22:49:59 2015
New Revision: 1690837

URL: http://svn.apache.org/r1690837
Log:
Bug 58133 - Agile encryption - wrong checksum calculation

Modified:
    poi/site/src/documentation/content/xdocs/status.xml
    poi/trunk/src/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java

Modified: poi/site/src/documentation/content/xdocs/status.xml
URL: 
http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/status.xml?rev=1690837&r1=1690836&r2=1690837&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/status.xml (original)
+++ poi/site/src/documentation/content/xdocs/status.xml Mon Jul 13 22:49:59 2015
@@ -39,6 +39,7 @@
     </devs>
 
     <release version="3.13-beta1" date="2015-07-??">
+        <action dev="PD" type="fix" fixes-bug="58133">Agile encryption - wrong 
checksum calculation</action>
         <action dev="PD" type="fix" fixes-bug="58113">Regression: 
NullPointerException when setting cell value to null</action>
         <action dev="DN" type="add" fixes-bug="57893">Add a method for 
obtaining all merged regions on a worksheet. This is faster for XSSFSheet than 
obtaining each individually by iteration.</action>
         <action dev="DN" type="add" fixes-bug="58036">Add basic support for 
VBA macro-enabled workbooks (xlsm)</action>

Modified: 
poi/trunk/src/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java?rev=1690837&r1=1690836&r2=1690837&view=diff
==============================================================================
--- 
poi/trunk/src/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java 
(original)
+++ 
poi/trunk/src/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java 
Mon Jul 13 22:49:59 2015
@@ -134,7 +134,7 @@ public abstract class ChunkedCipherOutpu
             super.close();
             
             int oleStreamSize = 
(int)(fileOut.length()+LittleEndianConsts.LONG_SIZE);
-            calculateChecksum(fileOut, oleStreamSize);
+            calculateChecksum(fileOut, (int)_pos);
             dir.createDocument(DEFAULT_POIFS_ENTRY, oleStreamSize, new 
EncryptedPackageWriter());
             createEncryptionInfoEntry(dir, fileOut);
         } catch (GeneralSecurityException e) {



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to