Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug 60230 - Roundtrip test that encrypts XSSFWorkbook and then decrypts it fails with latest code 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1764008 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andreas Beeker 2016-10-09 20:34:35 +00:00
parent 3c1f622ecf
commit 740932ee85
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/org/apache/poi/poifs/crypt/ChunkedCipherInputStream.java
View File

@ -199,7 +199,7 @@ public abstract class ChunkedCipherInputStream extends LittleEndianInputStream {
System.arraycopy(_plain, 0, _chunk, 0, totalBytes); System.arraycopy(_plain, 0, _chunk, 0, totalBytes);
invokeCipher(totalBytes, _chunkSize > -1); invokeCipher(totalBytes, totalBytes == _chunkSize);
} }
/** /**

9
src/ooxml/testcases/org/apache/poi/xssf/TestWorkbookProtection.java
View File

@ -189,7 +189,6 @@ public class TestWorkbookProtection {
assertTrue(wb.validateRevisionsPassword("test")); assertTrue(wb.validateRevisionsPassword("test"));
} }
@Ignore("bug 60230: currently failing due to regression from bug 59857 r1762726")
@Test @Test
public void testEncryptDecrypt() throws Exception { public void testEncryptDecrypt() throws Exception {
final String password = "abc123"; final String password = "abc123";
@ -208,7 +207,9 @@ public class TestWorkbookProtection {
EncryptionInfo encryptionInfo = new EncryptionInfo(EncryptionMode.agile); EncryptionInfo encryptionInfo = new EncryptionInfo(EncryptionMode.agile);
Encryptor enc = encryptionInfo.getEncryptor(); Encryptor enc = encryptionInfo.getEncryptor();
enc.confirmPassword(password); enc.confirmPassword(password);
OPCPackage opc = OPCPackage.open(new FileInputStream(tf1)); FileInputStream fis = new FileInputStream(tf1);
OPCPackage opc = OPCPackage.open(fis);
IOUtils.closeQuietly(fis);
try { try {
OutputStream os = enc.getDataStream(poiFileSystem); OutputStream os = enc.getDataStream(poiFileSystem);
opc.save(os); opc.save(os);
@ -221,7 +222,9 @@ public class TestWorkbookProtection {
poiFileSystem.writeFilesystem(fos2); poiFileSystem.writeFilesystem(fos2);
IOUtils.closeQuietly(fos2); IOUtils.closeQuietly(fos2);
workbook.close(); workbook.close();
POIFSFileSystem poiFileSystem2 = new POIFSFileSystem(new FileInputStream(tf1)); fis = new FileInputStream(tf1);
POIFSFileSystem poiFileSystem2 = new POIFSFileSystem(fis);
IOUtils.closeQuietly(fis);
EncryptionInfo encryptionInfo2 = new EncryptionInfo(poiFileSystem2); EncryptionInfo encryptionInfo2 = new EncryptionInfo(poiFileSystem2);
Decryptor decryptor = encryptionInfo2.getDecryptor(); Decryptor decryptor = encryptionInfo2.getDecryptor();
decryptor.verifyPassword(password); decryptor.verifyPassword(password);