From cdb8a029315f8a625d022c75c2bf1890d3dd36c9 Mon Sep 17 00:00:00 2001
From: Dominik Stadler <centic@apache.org>
Date: Thu, 22 Oct 2015 15:21:25 +0000
Subject: [PATCH] Set newer curvesapi-version in .classpath as well and update
 some third-party libs for the password-protection-code to the latest versions

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1710032 13f79535-47bb-0310-9956-ffa450edef68
---
 .classpath                                    | 10 ++--
 build.xml                                     | 52 +++++++++++--------
 sonar/ooxml/pom.xml                           |  6 +--
 .../poi/poifs/crypt/dsig/SignatureInfo.java   |  6 +--
 .../dsig/facets/XAdESXLSignatureFacet.java    |  2 +-
 5 files changed, 42 insertions(+), 34 deletions(-)

diff --git a/.classpath b/.classpath
index ab1f0776ca..82a60c0b5f 100644
--- a/.classpath
+++ b/.classpath
@@ -21,14 +21,14 @@
 	<classpathentry kind="lib" path="ooxml-lib/xmlbeans-2.6.0.jar"/>
 	<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
 	<classpathentry kind="lib" path="lib/junit-4.12.jar"/>
-  <classpathentry kind="lib" path="ooxml-lib/curvesapi-1.02.jar"/>
+	<classpathentry kind="lib" path="ooxml-lib/curvesapi-1.03.jar"/>
 	<classpathentry kind="lib" path="ooxml-lib/ooxml-schemas-1.2.jar" sourcepath="ooxml-lib/ooxml-schemas-1.2-sources.jar"/>
 	<classpathentry kind="lib" path="ooxml-lib/ooxml-security-1.0.jar" sourcepath="ooxml-lib/ooxml-security-1.0-sources.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="compile-lib/slf4j-api-1.7.7.jar"/>
-	<classpathentry kind="lib" path="compile-lib/bcpkix-jdk15on-1.51.jar"/>
-	<classpathentry kind="lib" path="compile-lib/bcprov-ext-jdk15on-1.51.jar"/>
-	<classpathentry kind="lib" path="compile-lib/xmlsec-2.0.1.jar"/>
+	<classpathentry kind="lib" path="compile-lib/slf4j-api-1.7.12.jar"/>
+	<classpathentry kind="lib" path="compile-lib/bcpkix-jdk15on-1.53.jar"/>
+	<classpathentry kind="lib" path="compile-lib/bcprov-ext-jdk15on-1.53.jar"/>
+	<classpathentry kind="lib" path="compile-lib/xmlsec-2.0.5.jar"/>
 	<classpathentry kind="lib" path="lib/commons-codec-1.10.jar"/>
 	<classpathentry kind="lib" path="lib/commons-logging-1.2.jar"/>
 	<classpathentry kind="output" path="build/eclipse"/>
diff --git a/build.xml b/build.xml
index b022403a0f..b34ad68b84 100644
--- a/build.xml
+++ b/build.xml
@@ -167,14 +167,14 @@ under the License.
     <property name="main.antlauncher.url" value="${repository.m2}/maven2/org/apache/ant/ant-launcher/1.9.4/ant-launcher-1.9.4.jar"/>
 
     <!-- xml signature libs -->
-    <property name="dsig.xmlsec.jar" location="${compile.lib}/xmlsec-2.0.1.jar"/>
-    <property name="dsig.xmlsec.url" value="${repository.m2}/maven2/org/apache/santuario/xmlsec/2.0.1/xmlsec-2.0.1.jar"/>
-    <property name="dsig.bouncycastle-prov.jar" location="${compile.lib}/bcprov-ext-jdk15on-1.51.jar"/>
-    <property name="dsig.bouncycastle-prov.url" value="${repository.m2}/maven2/org/bouncycastle/bcprov-ext-jdk15on/1.51/bcprov-ext-jdk15on-1.51.jar"/>
-    <property name="dsig.bouncycastle-pkix.jar" location="${compile.lib}/bcpkix-jdk15on-1.51.jar"/>
-    <property name="dsig.bouncycastle-pkix.url" value="${repository.m2}/maven2/org/bouncycastle/bcpkix-jdk15on/1.51/bcpkix-jdk15on-1.51.jar"/>
-    <property name="dsig.sl4j-api.jar" location="${compile.lib}/slf4j-api-1.7.7.jar"/>
-    <property name="dsig.sl4j-api.url" value="${repository.m2}/maven2/org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7.jar"/>
+    <property name="dsig.xmlsec.jar" location="${compile.lib}/xmlsec-2.0.5.jar"/>
+    <property name="dsig.xmlsec.url" value="${repository.m2}/maven2/org/apache/santuario/xmlsec/2.0.5/xmlsec-2.0.5.jar"/>
+    <property name="dsig.bouncycastle-prov.jar" location="${compile.lib}/bcprov-ext-jdk15on-1.53.jar"/>
+    <property name="dsig.bouncycastle-prov.url" value="${repository.m2}/maven2/org/bouncycastle/bcprov-ext-jdk15on/1.53/bcprov-ext-jdk15on-1.53.jar"/>
+    <property name="dsig.bouncycastle-pkix.jar" location="${compile.lib}/bcpkix-jdk15on-1.53.jar"/>
+    <property name="dsig.bouncycastle-pkix.url" value="${repository.m2}/maven2/org/bouncycastle/bcpkix-jdk15on/1.53/bcpkix-jdk15on-1.53.jar"/>
+    <property name="dsig.sl4j-api.jar" location="${compile.lib}/slf4j-api-1.7.12.jar"/>
+    <property name="dsig.sl4j-api.url" value="${repository.m2}/maven2/org/slf4j/slf4j-api/1.7.12/slf4j-api-1.7.12.jar"/>
 
     <!-- jars in the lib-ooxml directory, see the fetch-ooxml-jars target-->
     <property name="ooxml.curvesapi.jar" location="${ooxml.lib}/curvesapi-1.03.jar"/>
@@ -461,8 +461,16 @@ under the License.
             </fileset>
         	<fileset dir="${ooxml.lib}">
         		<include name="ooxml-schemas-1.1-sources.jar"/>
+        		<include name="ooxml-schemas-src-1.1.jar"/>
         		<include name="ooxml-schemas-1.1.jar"/>
         	</fileset>
+        	<fileset dir="${compile.lib}">
+                <include name="xercesImpl-*.jar"/>
+            	<include name="xmlsec-2.0.1.jar"/>
+            	<include name="bcprov-ext-jdk15on-1.51.jar"/>
+            	<include name="bcpkix-jdk15on-1.51.jar"/>
+            	<include name="slf4j-api-1.7.7.jar"/>
+        	</fileset>
         </delete>
 
         <condition property="jars.present">
@@ -1805,16 +1813,16 @@ under the License.
                 <exclude name="poi-*${version.id}-sources-*.jar"/>
                 <exclude name="poi-*${version.id}-javadocs-*.jar"/>
             </fileset>
-            <auxClasspath path="${compile.lib}/bcpkix-jdk15on-1.51.jar" />
-            <auxClasspath path="${compile.lib}/bcprov-ext-jdk15on-1.51.jar" />
-            <auxClasspath path="${compile.lib}/slf4j-api-1.7.7.jar" />
-            <auxClasspath path="${compile.lib}/xmlsec-2.0.1.jar" />
+            <auxClasspath path="${dsig.bouncycastle-pkix.jar}" />
+            <auxClasspath path="${dsig.bouncycastle-prov.jar}" />
+            <auxClasspath path="${dsig.sl4j-api.jar}" />
+            <auxClasspath path="${dsig.xmlsec.jar}" />
             <auxClasspath path="${ooxml.xsds.jar}" />
-            <auxClasspath path="ooxml-lib/ooxml-security-1.0.jar" />
-            <auxClasspath path="ooxml-lib/xmlbeans-2.6.0.jar" />
+            <auxClasspath path="${ooxml.security.jar}" />
+            <auxClasspath path="${ooxml.xmlbeans26.jar}" />
             <auxClasspath path="${main.commons-codec.jar}" />
             <auxClasspath path="${main.commons-logging.jar}" />
-            <auxClasspath path="lib/junit-4.12.jar" />
+            <auxClasspath path="${main.junit.jar}" />
             <sourcePath path="src/java" />
             <sourcePath path="src/ooxml/java" />
             <sourcePath path="src/scratchpad/src" />
@@ -1828,16 +1836,16 @@ under the License.
                 <exclude name="poi-*${version.id}-sources-*.jar"/>
                 <exclude name="poi-*${version.id}-javadocs-*.jar"/>
             </fileset>
-            <auxClasspath path="${compile.lib}/bcpkix-jdk15on-1.51.jar" />
-            <auxClasspath path="${compile.lib}/bcprov-ext-jdk15on-1.51.jar" />
-            <auxClasspath path="${compile.lib}/slf4j-api-1.7.7.jar" />
-            <auxClasspath path="${compile.lib}/xmlsec-2.0.1.jar" />
+            <auxClasspath path="${dsig.bouncycastle-pkix.jar}" />
+            <auxClasspath path="${dsig.bouncycastle-prov.jar}" />
+            <auxClasspath path="${dsig.sl4j-api.jar}" />
+            <auxClasspath path="${dsig.xmlsec.jar}" />
             <auxClasspath path="${ooxml.xsds.jar}" />
-            <auxClasspath path="ooxml-lib/ooxml-security-1.0.jar" />
-            <auxClasspath path="ooxml-lib/xmlbeans-2.6.0.jar" />
+            <auxClasspath path="${ooxml.security.jar}" />
+            <auxClasspath path="${ooxml.xmlbeans26.jar}" />
             <auxClasspath path="${main.commons-codec.jar}" />
             <auxClasspath path="${main.commons-logging.jar}" />
-            <auxClasspath path="lib/junit-4.12.jar" />
+            <auxClasspath path="${main.junit.jar}" />
             <sourcePath path="src/java" />
             <sourcePath path="src/ooxml/java" />
             <sourcePath path="src/scratchpad/src" />
diff --git a/sonar/ooxml/pom.xml b/sonar/ooxml/pom.xml
index b10db33d82..4d1b52a742 100644
--- a/sonar/ooxml/pom.xml
+++ b/sonar/ooxml/pom.xml
@@ -125,17 +125,17 @@
 		<dependency>
 			<groupId>org.bouncycastle</groupId>
 			<artifactId>bcpkix-jdk15on</artifactId>
-			<version>1.51</version>
+			<version>1.53</version>
 		</dependency>
 		<dependency>
 			<groupId>org.bouncycastle</groupId>
 			<artifactId>bcprov-jdk15on</artifactId>
-			<version>1.51</version>
+			<version>1.53</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.santuario</groupId>
 			<artifactId>xmlsec</artifactId>
-			<version>2.0.1</version>
+			<version>2.0.5</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.virtuald</groupId>
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java
index 9526c968b8..49c6828e93 100644
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java
+++ b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java
@@ -162,9 +162,9 @@ import org.w3c.dom.events.EventTarget;
  * <p>To use SignatureInfo and its sibling classes, you'll need to have the following libs
  * in the classpath:</p>
  * <ul>
- * <li>BouncyCastle bcpkix and bcprov (tested against 1.51)</li>
- * <li>Apache Santuario "xmlsec" (tested against 2.0.1)</li>
- * <li>and slf4j-api (tested against 1.7.7)</li>
+ * <li>BouncyCastle bcpkix and bcprov (tested against 1.53)</li>
+ * <li>Apache Santuario "xmlsec" (tested against 2.0.5)</li>
+ * <li>and slf4j-api (tested against 1.7.12)</li>
  * </ul>
  */
 public class SignatureInfo implements SignatureConfigurable {
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java
index 2427f09fd1..61d61cf810 100644
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java
+++ b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java
@@ -249,7 +249,7 @@ public class XAdESXLSignatureFacet extends SignatureFacet {
                     ResponderIDType responderId = ocspIdentifier.addNewResponderID();
     
                     RespID respId = basicOcspResp.getResponderId();
-                    ResponderID ocspResponderId = respId.toASN1Object();
+                    ResponderID ocspResponderId = respId.toASN1Primitive();
                     DERTaggedObject derTaggedObject = (DERTaggedObject)ocspResponderId.toASN1Primitive();
                     if (2 == derTaggedObject.getTagNo()) {
                         ASN1OctetString keyHashOctetString = (ASN1OctetString)derTaggedObject.getObject();