JCE policy assumption fix

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1767456 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestDecryptor.java b/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestDecryptor.java
index 19dc34b84e37eabdb57b5e751a1dd584def79bac..e17e2dcb8115246d21fe7440c67790b33afbde7f 100644 (file)
--- a/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestDecryptor.java
+++ b/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestDecryptor.java
@@ -29,12 +29,15 @@ import java.security.GeneralSecurityException;
 import java.util.zip.ZipEntry;\r
 import java.util.zip.ZipInputStream;\r
 \r
+import javax.crypto.Cipher;\r
+\r
 import org.apache.poi.POIDataSamples;\r
 import org.apache.poi.poifs.filesystem.DirectoryNode;\r
 import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;\r
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;\r
 import org.apache.poi.util.IOUtils;\r
 import org.apache.poi.xssf.XSSFTestDataSamples;\r
+import org.junit.Assume;\r
 import org.junit.Test;\r
 \r
 public class TestDecryptor {\r
@@ -161,6 +164,9 @@ public class TestDecryptor {
 \r
     @Test\r
     public void bug60320() throws IOException, GeneralSecurityException {\r
+        int maxKeyLen = Cipher.getMaxAllowedKeyLength("AES");\r
+        Assume.assumeTrue("Please install JCE Unlimited Strength Jurisdiction Policy files for AES 256", maxKeyLen == 2147483647);\r
+\r
         InputStream is = POIDataSamples.getPOIFSInstance().openResourceAsStream("60320-protected.xlsx");\r
         POIFSFileSystem fs = new POIFSFileSystem(is);\r
         is.close();\r

diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestEncryptor.java b/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestEncryptor.java
index f3e6c97e4c2c194705e1749004613ebe24246443..4a411cc3d953973b14c2765a47b461c6f13bf660 100644 (file)
--- a/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestEncryptor.java
+++ b/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestEncryptor.java
@@ -394,6 +394,9 @@ public class TestEncryptor {
      */\r
     @Test\r
     public void bug60320CustomEncrypt() throws Exception {\r
+        int maxKeyLen = Cipher.getMaxAllowedKeyLength("AES");\r
+        Assume.assumeTrue("Please install JCE Unlimited Strength Jurisdiction Policy files for AES 256", maxKeyLen == 2147483647);\r
+\r
         // --- src/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java  (revision 1766745)\r
         // +++ src/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java  (working copy)\r
         // @@ -208,6 +208,13 @@\r