From 0f522cec666dfe96984cfae125b6a426508de261 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Fri, 14 Feb 2020 23:18:44 +0000 Subject: [PATCH] bouncycastle 1.64 git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1874039 13f79535-47bb-0310-9956-ffa450edef68 --- .classpath | 6 ++--- build.gradle | 3 ++- build.xml | 25 ++++++++++--------- sonar/ooxml/pom.xml | 4 +-- .../poi/poifs/crypt/dsig/SignatureInfo.java | 4 +-- 5 files changed, 22 insertions(+), 20 deletions(-) diff --git a/.classpath b/.classpath index b668ce8c03..98fe5cd3cb 100644 --- a/.classpath +++ b/.classpath @@ -27,9 +27,9 @@ - - - + + + diff --git a/build.gradle b/build.gradle index e1904925ef..d91c0724bc 100644 --- a/build.gradle +++ b/build.gradle @@ -92,6 +92,7 @@ subprojects { version = '4.1.3-SNAPSHOT' ext { + bouncyCastleVersion = '1.64' commonsCodecVersion = '1.14' commonsCompressVersion = '1.20' commonsMathVersion = '3.6.1' @@ -241,7 +242,7 @@ project('ooxml') { implementation "org.apache.commons:commons-math3:${commonsMathVersion}" implementation "org.apache.commons:commons-compress:${commonsCompressVersion}" 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.zaxxer:SparseBitSet:1.2' diff --git a/build.xml b/build.xml index 7b54e82ce3..e31ab34ed7 100644 --- a/build.xml +++ b/build.xml @@ -225,12 +225,12 @@ under the License. - - - - - - + + + + + + @@ -325,10 +325,10 @@ under the License. - - - - + + + + @@ -718,10 +718,11 @@ under the License. + - - + + diff --git a/sonar/ooxml/pom.xml b/sonar/ooxml/pom.xml index 9a48891b08..4d8811d57b 100644 --- a/sonar/ooxml/pom.xml +++ b/sonar/ooxml/pom.xml @@ -137,12 +137,12 @@ org.bouncycastle bcpkix-jdk15on - 1.62 + 1.64 org.bouncycastle bcprov-jdk15on - 1.62 + 1.64 org.apache.santuario 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 8f81566566..c4f25f1222 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 @@ -148,9 +148,9 @@ import org.w3c.dom.events.EventTarget; *

To use SignatureInfo and its sibling classes, you'll need to have the following libs * in the classpath:

*
    - *
  • BouncyCastle bcpkix and bcprov (tested against 1.62)
  • + *
  • BouncyCastle bcpkix and bcprov (tested against 1.64)
  • *
  • Apache Santuario "xmlsec" (tested against 2.1.2)
  • - *
  • and slf4j-api (tested against 1.7.26)
  • + *
  • and slf4j-api (tested against 1.7.30)
  • *
*/ public class SignatureInfo implements SignatureConfigurable {