moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Add more output in case of unknown cipher-ids to aid in debugging bugs like 57195

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1641883 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dominik Stadler 2014-11-26 18:39:44 +00:00
parent 9d84f426f3
commit 4c451f44ed
2 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/java/org/apache/poi/poifs/crypt/CipherAlgorithm.java
View File

@ -64,7 +64,7 @@ public enum CipherAlgorithm {
for (CipherAlgorithm ca : CipherAlgorithm.values()) {
if (ca.ecmaId == ecmaId) return ca;
}
throw new EncryptedDocumentException("cipher algorithm not found");
throw new EncryptedDocumentException("cipher algorithm " + ecmaId + " not found");
}
public static CipherAlgorithm fromXmlId(String xmlId, int keySize) {
@ -74,8 +74,6 @@ public enum CipherAlgorithm {
if (ks == keySize) return ca;
}
}
throw new EncryptedDocumentException("cipher algorithm not found");
throw new EncryptedDocumentException("cipher algorithm " + xmlId + "/" + keySize + " not found");
}
}

42
src/testcases/org/apache/poi/poifs/crypt/TestCipherAlgorithm.java Normal file
View File

@ -0,0 +1,42 @@
package org.apache.poi.poifs.crypt;
import static org.junit.Assert.*;
import org.apache.poi.EncryptedDocumentException;
import org.junit.Test;
public class TestCipherAlgorithm {
@Test
public void test() {
assertEquals(128, CipherAlgorithm.aes128.defaultKeySize);
for(CipherAlgorithm alg : CipherAlgorithm.values()) {
assertEquals(alg, CipherAlgorithm.valueOf(alg.toString()));
}
assertEquals(CipherAlgorithm.aes128, CipherAlgorithm.fromEcmaId(0x660E));
assertEquals(CipherAlgorithm.aes192, CipherAlgorithm.fromXmlId("AES", 192));
try {
CipherAlgorithm.fromEcmaId(0);
fail("Should throw exception");
} catch (EncryptedDocumentException e) {
// expected
}
try {
CipherAlgorithm.fromXmlId("AES", 1);
fail("Should throw exception");
} catch (EncryptedDocumentException e) {
// expected
}
try {
CipherAlgorithm.fromXmlId("RC1", 0x40);
fail("Should throw exception");
} catch (EncryptedDocumentException e) {
// expected
}
}
}