Author: nick
Date: Tue Nov 4 23:22:50 2014
New Revision: 1636776
URL: http://svn.apache.org/r1636776
Log:
FilePassRecord type of 4 is now documented as the same as 2 & 3, see bug #35897
Added:
poi/trunk/test-data/spreadsheet/35897-type4.xls (with props)
Modified:
poi/trunk/src/java/org/apache/poi/hssf/record/FilePassRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestBiffViewer.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/FilePassRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/FilePassRecord.java?rev=1636776&r1=1636775&r2=1636776&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/FilePassRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/FilePassRecord.java Tue Nov
4 23:22:50 2014
@@ -45,6 +45,7 @@ public final class FilePassRecord extend
private static final int ENCRYPTION_OTHER_RC4 = 1;
private static final int ENCRYPTION_OTHER_CAPI_2 = 2;
private static final int ENCRYPTION_OTHER_CAPI_3 = 3;
+ private static final int ENCRYPTION_OTHER_CAPI_4 = 4;
private byte[] _salt;
private byte[] _encryptedVerifier;
@@ -60,6 +61,7 @@ public final class FilePassRecord extend
break;
case ENCRYPTION_OTHER_CAPI_2:
case ENCRYPTION_OTHER_CAPI_3:
+ case ENCRYPTION_OTHER_CAPI_4:
throw new EncryptedDocumentException(
"HSSF does not currently support CryptoAPI
encryption");
default:
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestBiffViewer.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestBiffViewer.java?rev=1636776&r1=1636775&r2=1636776&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestBiffViewer.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestBiffViewer.java Tue Nov
4 23:22:50 2014
@@ -36,6 +36,7 @@ public class TestBiffViewer extends Base
SILENT_EXCLUDED.add("43493.xls"); // HSSFWorkbook cannot
open it as well
SILENT_EXCLUDED.add("password.xls");
SILENT_EXCLUDED.add("46904.xls");
+ SILENT_EXCLUDED.add("35897-type4.xls"); // unsupported crypto api
header
SILENT_EXCLUDED.add("xor-encryption-abc.xls"); // unsupported
XOR-encryption
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java?rev=1636776&r1=1636775&r2=1636776&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java Tue Nov
4 23:22:50 2014
@@ -2460,6 +2460,13 @@ public final class TestBugs extends Base
} finally {
Biff8EncryptionKey.setCurrentUserPassword(null);
}
+
+ // One using the only-recently-documented encryption header type 4,
+ // and the RC4 CryptoAPI encryption header structure
+ try {
+ openSample("35897-type4.xls");
+ fail("POI doesn't currently support the RC4 CryptoAPI encryption
header structure");
+ } catch (EncryptedDocumentException e) {}
}
@Test
Added: poi/trunk/test-data/spreadsheet/35897-type4.xls
URL:
http://svn.apache.org/viewvc/poi/trunk/test-data/spreadsheet/35897-type4.xls?rev=1636776&view=auto
==============================================================================
Binary file - no diff available.
Propchange: poi/trunk/test-data/spreadsheet/35897-type4.xls
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
