poi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cen...@apache.org
Subject svn commit: r1710032 - in /poi: site/src/documentation/content/xdocs/ trunk/ trunk/sonar/ooxml/ trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/ trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/
Date Thu, 22 Oct 2015 15:21:25 GMT
Author: centic
Date: Thu Oct 22 15:21:25 2015
New Revision: 1710032

URL: http://svn.apache.org/viewvc?rev=1710032&view=rev
Log:
Set newer curvesapi-version in .classpath as well and update some third-party libs for the
password-protection-code to the latest versions

Modified:
    poi/site/src/documentation/content/xdocs/encryption.xml
    poi/site/src/documentation/content/xdocs/overview.xml
    poi/trunk/.classpath
    poi/trunk/build.xml
    poi/trunk/sonar/ooxml/pom.xml
    poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java
    poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java

Modified: poi/site/src/documentation/content/xdocs/encryption.xml
URL: http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/encryption.xml?rev=1710032&r1=1710031&r2=1710032&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/encryption.xml (original)
+++ poi/site/src/documentation/content/xdocs/encryption.xml Thu Oct 22 15:21:25 2015
@@ -241,9 +241,9 @@ fos.close();
      <p>The classes have been tested against the following libraries, which need to
be included additionally to the
      <link href="overview.html#components">default dependencies</link>:</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>
      <p>Depending on the <link href="http://poi.apache.org/apidocs/org/apache/poi/poifs/crypt/dsig/SignatureConfig.html">configuration</link>
      and the activated <link href="http://poi.apache.org/apidocs/org/apache/poi/poifs/crypt/dsig/facets/package-summary.html">facets</link>

Modified: poi/site/src/documentation/content/xdocs/overview.xml
URL: http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/overview.xml?rev=1710032&r1=1710031&r2=1710032&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/overview.xml (original)
+++ poi/site/src/documentation/content/xdocs/overview.xml Thu Oct 22 15:21:25 2015
@@ -298,10 +298,10 @@
           <td>ooxml-security</td>
           <td><link href="http://search.maven.org/#artifactdetails|org.apache.xmlbeans|xmlbeans|2.6.0|jar">xmlbeans</link><br/>
           For signing: 
-          <link href="http://search.maven.org/#artifactdetails|org.bouncycastle|bcpkix-jdk15on|1.51|jar">bcpkix-jdk15on</link>,
-          <link href="http://search.maven.org/#artifactdetails|org.bouncycastle|bcprov-jdk15on|1.51|jar">bcprov-jdk15on</link>,
-          <link href="http://search.maven.org/#artifactdetails|org.apache.santuario|xmlsec|2.0.1|bundle">xmlsec</link>,
-          <link href="http://search.maven.org/#artifactdetails|org.slf4j|slf4j-api|1.7.7|jar">slf4j-api</link>
+          <link href="http://search.maven.org/#artifactdetails|org.bouncycastle|bcpkix-jdk15on|1.53|jar">bcpkix-jdk15on</link>,
+          <link href="http://search.maven.org/#artifactdetails|org.bouncycastle|bcprov-jdk15on|1.53|jar">bcprov-jdk15on</link>,
+          <link href="http://search.maven.org/#artifactdetails|org.apache.santuario|xmlsec|2.0.5|bundle">xmlsec</link>,
+          <link href="http://search.maven.org/#artifactdetails|org.slf4j|slf4j-api|1.7.12|jar">slf4j-api</link>
           </td>
           <td><link href="http://search.maven.org/#artifactdetails|org.apache.poi|ooxml-security|1.0|jar">ooxml-security-1.0.jar</link></td>
         </tr>

Modified: poi/trunk/.classpath
URL: http://svn.apache.org/viewvc/poi/trunk/.classpath?rev=1710032&r1=1710031&r2=1710032&view=diff
==============================================================================
--- poi/trunk/.classpath (original)
+++ poi/trunk/.classpath Thu Oct 22 15:21:25 2015
@@ -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"/>

Modified: poi/trunk/build.xml
URL: http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1710032&r1=1710031&r2=1710032&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Thu Oct 22 15:21:25 2015
@@ -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" />

Modified: poi/trunk/sonar/ooxml/pom.xml
URL: http://svn.apache.org/viewvc/poi/trunk/sonar/ooxml/pom.xml?rev=1710032&r1=1710031&r2=1710032&view=diff
==============================================================================
--- poi/trunk/sonar/ooxml/pom.xml (original)
+++ poi/trunk/sonar/ooxml/pom.xml Thu Oct 22 15:21:25 2015
@@ -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>

Modified: poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java?rev=1710032&r1=1710031&r2=1710032&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java Thu Oct 22
15:21:25 2015
@@ -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 {

Modified: poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java?rev=1710032&r1=1710031&r2=1710032&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java
Thu Oct 22 15:21:25 2015
@@ -249,7 +249,7 @@ public class XAdESXLSignatureFacet exten
                     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();



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org


Mime
View raw message