some changes because of test errors

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

diff --git a/.classpath b/.classpath
index bcce3b2c0d49c9290496fd4be8f51ba9eddee0fa..a95bc314e124b977b7c040007522ef3d002d9cd5 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -24,6 +24,7 @@
        <classpathentry kind="lib" path="lib/junit-4.11.jar"/>\r
        <classpathentry kind="lib" path="ooxml-lib/ooxml-schemas-1.1.jar" sourcepath="ooxml-lib/ooxml-schemas-src-1.1.jar"/>\r
        <classpathentry kind="lib" path="ooxml-lib/ooxml-encryption-1.2.jar" sourcepath="ooxml-lib/ooxml-encryption-src-1.2.jar"/>\r
+       <classpathentry kind="lib" path="lib/com.springsource.org.objenesis-1.0.0.jar"/>\r
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
        <classpathentry kind="lib" path="lib/mockito-core-1.9.5.jar" sourcepath="E:/tmp/mavenRepo/org/mockito/mockito-core/1.9.5/mockito-core-1.9.5-sources.jar"/>\r
        <classpathentry kind="output" path="build/eclipse"/>\r

diff --git a/src/java/org/apache/poi/poifs/crypt/CryptoFunctions.java b/src/java/org/apache/poi/poifs/crypt/CryptoFunctions.java
index 85d3419cbcdbe776a19762667af2189f9b9f00e2..c84431fd85c9d456742c29173e435c6d352aea40 100644 (file)
--- a/src/java/org/apache/poi/poifs/crypt/CryptoFunctions.java
+++ b/src/java/org/apache/poi/poifs/crypt/CryptoFunctions.java
@@ -278,7 +278,9 @@ public class CryptoFunctions {
     public static void registerBouncyCastle() {\r
         if (Security.getProvider("BC") != null) return;\r
         try {\r
-            Class<Provider> clazz = (Class<Provider>)Class.forName("org.bouncycastle.jce.provider.BouncyCastleProvider");\r
+            ClassLoader cl = Thread.currentThread().getContextClassLoader();\r
+            String bcProviderName = "org.bouncycastle.jce.provider.BouncyCastleProvider";\r
+            Class<Provider> clazz = (Class<Provider>)cl.loadClass(bcProviderName);\r
             Security.addProvider(clazz.newInstance());\r
         } catch (Exception e) {\r
             throw new EncryptedDocumentException("Only the BouncyCastle provider supports your encryption settings - please add it to the classpath.");\r

diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/HorribleProxies.java b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/HorribleProxies.java
index 96395b3d08ae87e6c94e44dbbac2d13ca2b4459d..9a6d6c3bf6e7a58fc441db541d58fc7de1fcd025 100644 (file)
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/HorribleProxies.java
+++ b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/HorribleProxies.java
@@ -62,7 +62,7 @@ public interface HorribleProxies {
     }\r
     \r
     public interface BasicOCSPRespIf extends ProxyIf {\r
-        String delegateClass = "org.bouncycastle.cert.ocsp.BasicOCSPResp";\r
+        String delegateClass = "org.bouncycastle.ocsp.BasicOCSPResp";\r
         Date getProducedAt();\r
         RespIDIf getResponderId();\r
     }\r
@@ -174,7 +174,7 @@ public interface HorribleProxies {
     }\r
     \r
     public interface OCSPRespIf extends ProxyIf {\r
-        String delegateClass = "org.bouncycastle.cert.ocsp.OCSPResp";\r
+        String delegateClass = "org.bouncycastle.ocsp.OCSPResp";\r
         BasicOCSPRespIf getResponseObject();\r
         byte[] getEncoded() throws IOException;\r
     }\r
@@ -185,7 +185,7 @@ public interface HorribleProxies {
     }\r
 \r
     public interface RespIDIf extends ProxyIf {\r
-        String delegateClass = "org.bouncycastle.cert.ocsp.RespID";\r
+        String delegateClass = "org.bouncycastle.ocsp.RespID";\r
         ResponderIDIf toASN1Object();\r
     }\r
     \r
@@ -291,7 +291,7 @@ public interface HorribleProxies {
     }\r
 \r
     public interface OCSPReqIf extends ProxyIf {\r
-        String delegateClass = "org.bouncycastle.cert.ocsp.OCSPReq";\r
+        String delegateClass = "org.bouncycastle.ocsp.OCSPReq";\r
 \r
         ReqIf[] getRequestList();\r
     }\r
@@ -312,7 +312,7 @@ public interface HorribleProxies {
     }\r
     \r
     public interface CertificateIDIf extends ProxyIf {\r
-        String delegateClass = "org.bouncycastle.cert.ocsp.CertificateID";\r
+        String delegateClass = "org.bouncycastle.ocsp.CertificateID";\r
         \r
         String HASH_SHA1();\r
     }\r
@@ -336,7 +336,7 @@ public interface HorribleProxies {
     }\r
     \r
     public interface X509V2CRLGeneratorIf extends ProxyIf {\r
-        String delegateClass = "org.bouncycastle.asn1.x509.X509V2CRLGenerator";\r
+        String delegateClass = "org.bouncycastle.x509.X509V2CRLGenerator";\r
         \r
         void setIssuerDN(X500Principal issuerDN);\r
         void setThisUpdate(Date date);\r
@@ -348,19 +348,19 @@ public interface HorribleProxies {
     }\r
     \r
     public interface ReqIf extends ProxyIf {\r
-        String delegateClass = "org.bouncycastle.cert.ocsp.Req";\r
+        String delegateClass = "org.bouncycastle.ocsp.Req";\r
         \r
         CertificateIDIf getCertID();\r
     }\r
     \r
     public interface CertificateStatusIf extends ProxyIf {\r
-        String delegateClass = "org.bouncycastle.cert.ocsp.CertificateStatus";\r
+        String delegateClass = "org.bouncycastle.ocsp.CertificateStatus";\r
         \r
         CertificateStatusIf GOOD();\r
     }\r
     \r
     public interface RevokedStatusIf extends ProxyIf {\r
-        String delegateClass = "org.bouncycastle.cert.ocsp.RevokedStatus";\r
+        String delegateClass = "org.bouncycastle.ocsp.RevokedStatus";\r
     }\r
     \r
     public interface CRLReasonIf extends ProxyIf {\r

diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/HorribleProxy.java b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/HorribleProxy.java
index 2ac5128ee624377a93c21499218906f6868fd8d0..7dd05db7cf51b389c80d252c3778dacdf0c21a09 100644 (file)
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/HorribleProxy.java
+++ b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/HorribleProxy.java
@@ -146,6 +146,7 @@ public class HorribleProxy implements InvocationHandler {
                    try {\r
                        Field f = delegateClass.getDeclaredField(methodName);\r
                        ret = f.get(delegateRef);\r
+                if (ret == null) return null;\r
                        isStaticField = true;\r
                    } catch (NoSuchFieldException e) {\r
                        LOG.log(POILogger.DEBUG, "No static field '"+methodName+"' in class '"+delegateClass.getCanonicalName()+"' - trying method now.");\r

diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/PkiTestUtils.java b/src/ooxml/testcases/org/apache/poi/poifs/crypt/PkiTestUtils.java
index 6d6592a2a35d447c7180ab31664237d2f6cee777..5f205612e512f63e6b3fa75036f44dcf4ebca12b 100644 (file)
--- a/src/ooxml/testcases/org/apache/poi/poifs/crypt/PkiTestUtils.java
+++ b/src/ooxml/testcases/org/apache/poi/poifs/crypt/PkiTestUtils.java
@@ -50,7 +50,6 @@ import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;\r
 import javax.xml.transform.stream.StreamResult;\r
 \r
-import org.apache.poi.poifs.crypt.dsig.HorribleProxy;\r
 import org.apache.poi.poifs.crypt.dsig.HorribleProxies.ASN1InputStreamIf;\r
 import org.apache.poi.poifs.crypt.dsig.HorribleProxies.AuthorityInformationAccessIf;\r
 import org.apache.poi.poifs.crypt.dsig.HorribleProxies.AuthorityKeyIdentifierIf;\r
@@ -81,6 +80,7 @@ import org.apache.poi.poifs.crypt.dsig.HorribleProxies.X509ObjectIdentifiersIf;
 import org.apache.poi.poifs.crypt.dsig.HorribleProxies.X509PrincipalIf;\r
 import org.apache.poi.poifs.crypt.dsig.HorribleProxies.X509V2CRLGeneratorIf;\r
 import org.apache.poi.poifs.crypt.dsig.HorribleProxies.X509V3CertificateGeneratorIf;\r
+import org.apache.poi.poifs.crypt.dsig.HorribleProxy;\r
 import org.w3c.dom.Document;\r
 import org.w3c.dom.Node;\r
 import org.xml.sax.InputSource;\r
@@ -282,7 +282,8 @@ public class PkiTestUtils {
         // request\r
         OCSPReqGeneratorIf ocspReqGenerator = HorribleProxy.newProxy(OCSPReqGeneratorIf.class);\r
         CertificateIDIf certId = HorribleProxy.newProxy(CertificateIDIf.class);\r
-        certId = HorribleProxy.newProxy(CertificateIDIf.class, certId.HASH_SHA1(),\r
+        String hashSha1 = certId.HASH_SHA1();\r
+        certId = HorribleProxy.newProxy(CertificateIDIf.class, hashSha1,\r
                 issuerCertificate, certificate.getSerialNumber());\r
         ocspReqGenerator.addRequest(certId);\r
         OCSPReqIf ocspReq = ocspReqGenerator.generate();\r

diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSignatureInfo.java b/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSignatureInfo.java
index b3f08b3c8ba6b76ed5432ceff0e23552e182b169..191066014fa538e6898736ed867f1b1f6b3883ce 100644 (file)
--- a/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSignatureInfo.java
+++ b/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSignatureInfo.java
@@ -95,6 +95,7 @@ public class TestSignatureInfo {
         ClassLoader cl = Thread.currentThread().getContextClassLoader();\r
         URLClassLoader ucl = new URLClassLoader(new URL[]{bcJar.toURI().toURL()}, cl);\r
         Thread.currentThread().setContextClassLoader(ucl);\r
+        CryptoFunctions.registerBouncyCastle();\r
     }\r
     \r
     @Test\r