Skip to content

Commit b0f9002

Browse files
committed
GEODE-10583: Upgrade transitive bcprov-jdk18on from 1.82 to 1.84 (#8008)
Pin org.bouncycastle:bcprov-jdk18on (transitive via org.apache.shiro:shiro-crypto-hash:2.1.0) to 1.84 to remediate CVE-2026-0636 (LDAP Injection), CVE-2026-5598 (Covert Timing Channel in FrodoEngine), and CVE-2025-14813 (broken GOSTCTR in G3413CTRBlockCipher), all of which affect 1.82 and are fixed in 1.84. - Add bouncycastle.version=1.84 and api constraint in DependencyConstraints.groovy - Update integration-test classpath fixtures to reference bcprov-jdk18on-1.84.jar (cherry picked from commit 3f3dbb9)
1 parent 9190bb5 commit b0f9002

4 files changed

Lines changed: 7 additions & 3 deletions

File tree

build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ class DependencyConstraints {
5050
deps.put("log4j-slf4j2-impl.version", "2.23.1")
5151
deps.put("micrometer.version", "1.14.0")
5252
deps.put("shiro.version", "2.1.0")
53+
// GEODE-10583: Pin Bouncy Castle (transitive via shiro-crypto-hash) to a fixed version
54+
deps.put("bouncycastle.version", "1.84")
5355
deps.put("slf4j-api.version", "2.0.17")
5456
deps.put("jakarta.transaction-api.version", "2.0.1")
5557
deps.put("jboss-modules.version", "1.11.0.Final")
@@ -179,6 +181,8 @@ class DependencyConstraints {
179181
api(group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.13')
180182
api(group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.4.15')
181183
api(group: 'org.apache.shiro', name: 'shiro-core', version: get('shiro.version'))
184+
// GEODE-10583: Pin Bouncy Castle provider (pulled in via shiro-crypto-hash) to 1.84
185+
api(group: 'org.bouncycastle', name: 'bcprov-jdk18on', version: get('bouncycastle.version'))
182186
api(group: 'org.assertj', name: 'assertj-core', version: '3.22.0')
183187
api(group: 'org.awaitility', name: 'awaitility', version: '4.2.0')
184188
api(group: 'org.buildobjects', name: 'jproc', version: '2.8.0')

geode-assembly/src/integrationTest/resources/assembly_content.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -923,7 +923,7 @@ lib/antlr-runtime-3.5.2.jar
923923
lib/asm-9.9.1.jar
924924
lib/asm-commons-9.9.1.jar
925925
lib/asm-tree-9.9.1.jar
926-
lib/bcprov-jdk18on-1.82.jar
926+
lib/bcprov-jdk18on-1.84.jar
927927
lib/classgraph-4.8.147.jar
928928
lib/classmate-1.5.1.jar
929929
lib/commons-beanutils-1.11.0.jar

geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,4 +142,4 @@ jboss-logging-3.4.3.Final.jar
142142
classmate-1.5.1.jar
143143
jakarta.el-api-5.0.0.jar
144144
jakarta.inject-api-2.0.1.jar
145-
bcprov-jdk18on-1.82.jar
145+
bcprov-jdk18on-1.84.jar

geode-server-all/src/integrationTest/resources/dependency_classpath.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ asm-commons-9.9.1.jar
124124
asm-tree-9.9.1.jar
125125
asm-9.9.1.jar
126126
txw2-4.0.2.jar
127-
bcprov-jdk18on-1.82.jar
127+
bcprov-jdk18on-1.84.jar
128128
reactor-core-3.6.10.jar
129129
jline-console-3.26.3.jar
130130
jline-builtins-3.26.3.jar

0 commit comments

Comments
 (0)