Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bouncycastle 1.64 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1874039 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2020-02-14 23:18:44 +00:00
parent e287107607
commit 0f522cec66
5 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.classpath
View File

@ -27,9 +27,9 @@
<classpathentry kind="lib" path="lib/jmh-core-1.19.jar"/> <classpathentry kind="lib" path="lib/jmh-core-1.19.jar"/>
<classpathentry kind="lib" path="lib/jmh-generator-annprocess-1.19.jar"/> <classpathentry kind="lib" path="lib/jmh-generator-annprocess-1.19.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry exported="true" kind="lib" path="compile-lib/slf4j-api-1.7.26.jar"/> <classpathentry exported="true" kind="lib" path="compile-lib/slf4j-api-1.7.30.jar"/>
<classpathentry kind="lib" path="compile-lib/bcpkix-jdk15on-1.62.jar"/> <classpathentry kind="lib" path="compile-lib/bcpkix-jdk15on-1.64.jar"/>
<classpathentry kind="lib" path="compile-lib/bcprov-ext-jdk15on-1.62.jar"/> <classpathentry kind="lib" path="compile-lib/bcprov-ext-jdk15on-1.64.jar"/>
<classpathentry kind="lib" path="ooxml-testlib/reflections.jar"/> <classpathentry kind="lib" path="ooxml-testlib/reflections.jar"/>
<classpathentry kind="lib" path="ooxml-testlib/guava.jar"/> <classpathentry kind="lib" path="ooxml-testlib/guava.jar"/>
<classpathentry kind="lib" path="ooxml-testlib/javassist.jar"/> <classpathentry kind="lib" path="ooxml-testlib/javassist.jar"/>

3
build.gradle
View File

@ -92,6 +92,7 @@ subprojects {
version = '4.1.3-SNAPSHOT' version = '4.1.3-SNAPSHOT'
ext { ext {
bouncyCastleVersion = '1.64'
commonsCodecVersion = '1.14' commonsCodecVersion = '1.14'
commonsCompressVersion = '1.20' commonsCompressVersion = '1.20'
commonsMathVersion = '3.6.1' commonsMathVersion = '3.6.1'
@ -241,7 +242,7 @@ project('ooxml') {
implementation "org.apache.commons:commons-math3:${commonsMathVersion}" implementation "org.apache.commons:commons-math3:${commonsMathVersion}"
implementation "org.apache.commons:commons-compress:${commonsCompressVersion}" implementation "org.apache.commons:commons-compress:${commonsCompressVersion}"
implementation 'org.apache.santuario:xmlsec:2.1.2' implementation 'org.apache.santuario:xmlsec:2.1.2'
implementation 'org.bouncycastle:bcpkix-jdk15on:1.62' implementation "org.bouncycastle:bcpkix-jdk15on:${bouncyCastleVersion}"
implementation 'com.github.virtuald:curvesapi:1.06' implementation 'com.github.virtuald:curvesapi:1.06'
implementation 'com.zaxxer:SparseBitSet:1.2' implementation 'com.zaxxer:SparseBitSet:1.2'

25
build.xml
View File

@ -225,12 +225,12 @@ under the License.
<!-- xml signature libs --> <!-- xml signature libs -->
<property name="dsig.xmlsec.jar" location="${compile.lib}/xmlsec-2.1.2.jar"/> <property name="dsig.xmlsec.jar" location="${compile.lib}/xmlsec-2.1.2.jar"/>
<property name="dsig.xmlsec.url" value="${repository.m2}/maven2/org/apache/santuario/xmlsec/2.1.2/xmlsec-2.1.2.jar"/> <property name="dsig.xmlsec.url" value="${repository.m2}/maven2/org/apache/santuario/xmlsec/2.1.2/xmlsec-2.1.2.jar"/>
<property name="dsig.bouncycastle-prov.jar" location="${compile.lib}/bcprov-ext-jdk15on-1.62.jar"/> <property name="dsig.bouncycastle-prov.jar" location="${compile.lib}/bcprov-ext-jdk15on-1.64.jar"/>
<property name="dsig.bouncycastle-prov.url" value="${repository.m2}/maven2/org/bouncycastle/bcprov-ext-jdk15on/1.62/bcprov-ext-jdk15on-1.62.jar"/> <property name="dsig.bouncycastle-prov.url" value="${repository.m2}/maven2/org/bouncycastle/bcprov-ext-jdk15on/1.64/bcprov-ext-jdk15on-1.64.jar"/>
<property name="dsig.bouncycastle-pkix.jar" location="${compile.lib}/bcpkix-jdk15on-1.62.jar"/> <property name="dsig.bouncycastle-pkix.jar" location="${compile.lib}/bcpkix-jdk15on-1.64.jar"/>
<property name="dsig.bouncycastle-pkix.url" value="${repository.m2}/maven2/org/bouncycastle/bcpkix-jdk15on/1.62/bcpkix-jdk15on-1.62.jar"/> <property name="dsig.bouncycastle-pkix.url" value="${repository.m2}/maven2/org/bouncycastle/bcpkix-jdk15on/1.64/bcpkix-jdk15on-1.64.jar"/>
<property name="dsig.sl4j-api.jar" location="${compile.lib}/slf4j-api-1.7.26.jar"/> <property name="dsig.sl4j-api.jar" location="${compile.lib}/slf4j-api-1.7.30.jar"/>
<property name="dsig.sl4j-api.url" value="${repository.m2}/maven2/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26.jar"/> <property name="dsig.sl4j-api.url" value="${repository.m2}/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/>
<!-- svg/batik libs - not part of the distribution --> <!-- svg/batik libs - not part of the distribution -->
<property name="svg.batik-all.url" value="${repository.m2}/maven2/org/apache/xmlgraphics/batik-all/1.11/batik-all-1.11.jar"/> <property name="svg.batik-all.url" value="${repository.m2}/maven2/org/apache/xmlgraphics/batik-all/1.11/batik-all-1.11.jar"/>
@ -325,10 +325,10 @@ under the License.
<property name="halt.on.test.failure" value="true"/> <property name="halt.on.test.failure" value="true"/>
<!-- helper jars for pgp signing, building and nexus staging --> <!-- helper jars for pgp signing, building and nexus staging -->
<property name="dist.bouncycastle-prov.jar" location="${compile.lib}/bcprov-ext-jdk15on-1.62.jar"/> <property name="dist.bouncycastle-prov.jar" location="${compile.lib}/bcprov-ext-jdk15on-1.64.jar"/>
<property name="dist.bouncycastle-prov.url" value="${repository.m2}/maven2/org/bouncycastle/bcprov-ext-jdk15on/1.62/bcprov-ext-jdk15on-1.62.jar"/> <property name="dist.bouncycastle-prov.url" value="${repository.m2}/maven2/org/bouncycastle/bcprov-ext-jdk15on/1.64/bcprov-ext-jdk15on-1.64.jar"/>
<property name="dist.bouncycastle-bcpg.jar" location="${compile.lib}/bcpg-jdk15on-1.62.jar"/> <property name="dist.bouncycastle-bcpg.jar" location="${compile.lib}/bcpg-jdk15on-1.64.jar"/>
<property name="dist.bouncycastle-bcpg.url" value="${repository.m2}/maven2/org/bouncycastle/bcpg-jdk15on/1.62/bcpg-jdk15on-1.62.jar"/> <property name="dist.bouncycastle-bcpg.url" value="${repository.m2}/maven2/org/bouncycastle/bcpg-jdk15on/1.64/bcpg-jdk15on-1.64.jar"/>
<property name="dist.commons-openpgp.jar" location="${compile.lib}/commons-openpgp-1.0-SNAPSHOT.jar"/> <property name="dist.commons-openpgp.jar" location="${compile.lib}/commons-openpgp-1.0-SNAPSHOT.jar"/>
<property name="dist.commons-openpgp.url" value="https://repository.apache.org/content/groups/snapshots/org/apache/commons/commons-openpgp/1.0-SNAPSHOT/commons-openpgp-1.0-20190121.221905-12.jar"/> <property name="dist.commons-openpgp.url" value="https://repository.apache.org/content/groups/snapshots/org/apache/commons/commons-openpgp/1.0-SNAPSHOT/commons-openpgp-1.0-20190121.221905-12.jar"/>
<property name="dist.nexus-staging.jar" location="${compile.lib}/nexus-staging-ant-tasks-1.6.3-uber.jar"/> <property name="dist.nexus-staging.jar" location="${compile.lib}/nexus-staging-ant-tasks-1.6.3-uber.jar"/>
@ -718,10 +718,11 @@ under the License.
<include name="bc*jdk15on-1.5*.jar"/> <include name="bc*jdk15on-1.5*.jar"/>
<include name="bc*jdk15on-1.60*.jar"/> <include name="bc*jdk15on-1.60*.jar"/>
<include name="bc*jdk15on-1.61*.jar"/> <include name="bc*jdk15on-1.61*.jar"/>
<include name="bc*jdk15on-1.62*.jar"/>
<include name="batik-all-1.10.jar"/> <include name="batik-all-1.10.jar"/>
<include name="slf4j-api-1.7.7.jar"/> <include name="slf4j-api-1.7.7.jar"/>
<include name="slf4j-api-1.7.12.jar"/> <include name="slf4j-api-1.7.1*.jar"/>
<include name="slf4j-api-1.7.25.jar"/> <include name="slf4j-api-1.7.2*.jar"/>
</fileset> </fileset>
</delete> </delete>

4
sonar/ooxml/pom.xml
View File

@ -137,12 +137,12 @@
<dependency> <dependency>
<groupId>org.bouncycastle</groupId> <groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId> <artifactId>bcpkix-jdk15on</artifactId>
<version>1.62</version> <version>1.64</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.bouncycastle</groupId> <groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId> <artifactId>bcprov-jdk15on</artifactId>
<version>1.62</version> <version>1.64</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.santuario</groupId> <groupId>org.apache.santuario</groupId>

4
src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java
View File

@ -148,9 +148,9 @@ import org.w3c.dom.events.EventTarget;
* <p>To use SignatureInfo and its sibling classes, you'll need to have the following libs * <p>To use SignatureInfo and its sibling classes, you'll need to have the following libs
* in the classpath:</p> * in the classpath:</p>
* <ul> * <ul>
* <li>BouncyCastle bcpkix and bcprov (tested against 1.62)</li> * <li>BouncyCastle bcpkix and bcprov (tested against 1.64)</li>
* <li>Apache Santuario "xmlsec" (tested against 2.1.2)</li> * <li>Apache Santuario "xmlsec" (tested against 2.1.2)</li>
* <li>and slf4j-api (tested against 1.7.26)</li> * <li>and slf4j-api (tested against 1.7.30)</li>
* </ul> * </ul>
*/ */
public class SignatureInfo implements SignatureConfigurable { public class SignatureInfo implements SignatureConfigurable {