bouncycastle 1.74

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

diff --git a/build.gradle b/build.gradle
index 0d63efa898f2036ec5a145d5cd132c3ed9264548..7af144acffa94f65d669d6784f7726757eced358 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -117,7 +117,7 @@ subprojects {
     apply plugin: 'com.adarshr.test-logger'
 
     ext {
-        bouncyCastleVersion = '1.73'
+        bouncyCastleVersion = '1.74'
         commonsCodecVersion = '1.15'
         commonsCompressVersion = '1.23.0'
         commonsIoVersion = '2.13.0'

diff --git a/build.xml b/build.xml
index 8eb3eaea2ae729d52ef407993cd52dfa8204ee08..fe55d8b26371f2e5e9eb1724474d62b12d32f9b9 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -296,11 +296,11 @@ under the License.
 
     <!-- xml signature libs - not part of the distribution -->
     <dependency prefix="dsig.xmlsec" artifact="org.apache.santuario:xmlsec:3.0.2" usage="ooxml-provided"/>
-    <dependency prefix="dsig.bouncycastle-prov" artifact="org.bouncycastle:bcprov-jdk18on:1.73" usage="ooxml-provided"/>
-    <dependency prefix="dsig.bouncycastle-pkix" artifact="org.bouncycastle:bcpkix-jdk18on:1.73" usage="ooxml-provided"/>
-    <dependency prefix="dsig.bouncycastle-util" artifact="org.bouncycastle:bcutil-jdk18on:1.73" usage="ooxml-provided"/>
+    <dependency prefix="dsig.bouncycastle-prov" artifact="org.bouncycastle:bcprov-jdk18on:1.74" usage="ooxml-provided"/>
+    <dependency prefix="dsig.bouncycastle-pkix" artifact="org.bouncycastle:bcpkix-jdk18on:1.74" usage="ooxml-provided"/>
+    <dependency prefix="dsig.bouncycastle-util" artifact="org.bouncycastle:bcutil-jdk18on:1.74" usage="ooxml-provided"/>
     <!-- only used for signing the release - not used with the ooxml signatures -->
-    <dependency prefix="dsig.bouncycastle-bcpg" artifact="org.bouncycastle:bcpg-jdk18on:1.73" usage="util"/>
+    <dependency prefix="dsig.bouncycastle-bcpg" artifact="org.bouncycastle:bcpg-jdk18on:1.74" usage="util"/>
     <dependency prefix="ooxml.test.stax2" artifact="org.codehaus.woodstox:stax2-api:4.2.1" usage="ooxml-provided"/>
 
     <!-- svg/batik/pdf libs - not part of the distribution - move batik to its own directory because of JPMS module-path issues -->

diff --git a/osgi/README.md b/osgi/README.md
index 8fb8dafb357818b7ee303aaba6ebcc0e948bf765..a77066c717bd7505f85055b5abef9ecc7b2aeb2e 100644 (file)
--- a/osgi/README.md
+++ b/osgi/README.md
@@ -29,7 +29,7 @@ These are required to sign or validate signed Office documents. The OSGi bundles
     
     - XML Commons Resolver: https://mvnrepository.com/artifact/xml-resolver/xml-resolver/1.2-osgi
     
-    - Bouncy Castle: https://mvnrepository.com/artifact/org.bouncycastle/bcprov-ext-jdk18on/1.73, https://mvnrepository.com/artifact/org.bouncycastle/bcpkix-jdk18on/1.73
+    - Bouncy Castle: https://mvnrepository.com/artifact/org.bouncycastle/bcprov-ext-jdk18on/1.74, https://mvnrepository.com/artifact/org.bouncycastle/bcpkix-jdk18on/1.74
 4. PDFBox and PDFBox Graphics2D  
 Required to render to PDF documents.
 The required jars can be downloaded from:

diff --git a/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java
index f0283b1f5aec5066996f3c7ffb7469980fc05f36..cc919b3e6b670d919f364891a274d206ddbd9daa 100644 (file)
--- a/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java
@@ -153,7 +153,7 @@ import org.w3c.dom.events.MutationEvent;
  * <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.73)</li>
+ * <li>BouncyCastle bcpkix and bcprov (tested against 1.74)</li>
  * <li>Apache Santuario "xmlsec" (tested against 3.0.2)</li>
  * <li>and log4j-api (tested against 2.20.x)</li>
  * </ul>