Skip to content

Commit 77bf12f

Browse files
authored
Upgrade Bouncy Castle jars (except for the FIPS jars) (#103818)
This commit upgrades the non-FIPS jars to the lastest available versions for 7.17. Bouncy Castle slightly changed their naming as evident by bouncycastle.org/latest_releases.html They no longer maintain a jdk15on library and instead use strategy for [1.5->1.8) and [1.8 -> ). This commit adopts the jdk18on libraries with the latest version. related: #100923
1 parent 8b62001 commit 77bf12f

19 files changed

+37
-30
lines changed

build-tools-internal/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ commons_lang3 = 3.9
2525
# - plugins/ingest-attachment (transitive dependency, check the upstream POM)
2626
# - distribution/tools/plugin-cli
2727
# - x-pack/plugin/security
28-
bouncycastle=1.64
28+
bouncycastle=1.77
2929
# test dependencies
3030
randomizedrunner = 2.8.0
3131
junit = 4.13.2

docs/changelog/103818.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 103818
2+
summary: Upgrade Bouncy Castle jars (except for the FIPS jars)
3+
area: "Security"
4+
type: upgrade
5+
issues: []

gradle/verification-metadata.xml

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3165,9 +3165,9 @@
31653165
<sha256 value="703ecd8a3a619800269bc8cd442f2ebf469bd2fe70478364f58ddc6460c35f9f" origin="Generated by Gradle"/>
31663166
</artifact>
31673167
</component>
3168-
<component group="org.bouncycastle" name="bcmail-jdk15on" version="1.64">
3169-
<artifact name="bcmail-jdk15on-1.64.jar">
3170-
<sha256 value="9b88abe9e981d17113a081a4b4261f4082ccdf9144a8a8373fc460c586f6b13a" origin="Generated by Gradle"/>
3168+
<component group="org.bouncycastle" name="bcmail-jdk18on" version="1.77">
3169+
<artifact name="bcmail-jdk18on-1.77.jar">
3170+
<sha256 value="659ea523fc58ccd142e9e74c5c6cf9a4dcf4288915a73dbaa5eb3edf1d5b0283" origin="Generated by Gradle"/>
31713171
</artifact>
31723172
</component>
31733173
<component group="org.bouncycastle" name="bcpg-fips" version="1.0.7.1">
@@ -3185,31 +3185,36 @@
31853185
<sha256 value="a82ac5bc24bcbf6ba9eb70f334d6782e25245c8da36d9848ad553b5b7b68efd1" origin="Generated by Gradle"/>
31863186
</artifact>
31873187
</component>
3188-
<component group="org.bouncycastle" name="bcpkix-jdk15on" version="1.64">
3189-
<artifact name="bcpkix-jdk15on-1.64.jar">
3190-
<sha256 value="84669138b1d99143e2c009024f67824ab8d3edb9b05b7591f5ebfb020a4bda71" origin="Generated by Gradle"/>
3188+
<component group="org.bouncycastle" name="bcpkix-jdk18on" version="1.77">
3189+
<artifact name="bcpkix-jdk18on-1.77.jar">
3190+
<sha256 value="1ac7fe8efd5b2f38cdc165be5a0675734fe44808dab92707201f03a535d6f1b8" origin="Generated by Gradle"/>
31913191
</artifact>
31923192
</component>
31933193
<component group="org.bouncycastle" name="bcprov-jdk15on" version="1.60">
31943194
<artifact name="bcprov-jdk15on-1.60.jar">
31953195
<sha256 value="7f1a0e6badab38666f8467a9a0ee96656b2f8ec8623867ed34f3cdc173b7ee07" origin="Generated by Gradle"/>
31963196
</artifact>
31973197
</component>
3198-
<component group="org.bouncycastle" name="bcprov-jdk15on" version="1.64">
3199-
<artifact name="bcprov-jdk15on-1.64.jar">
3200-
<sha256 value="a4f463ce552b908a722fa198ef4892a226b3225e453f8df10d5c0a5bfe5db6b6" origin="Generated by Gradle"/>
3201-
</artifact>
3202-
</component>
32033198
<component group="org.bouncycastle" name="bcprov-jdk15on" version="1.69">
32043199
<artifact name="bcprov-jdk15on-1.69.jar">
32053200
<sha256 value="e469bd39f936999f256002631003ff022a22951da9d5bd9789c7abfa9763a292" origin="Generated by Gradle"/>
32063201
</artifact>
32073202
</component>
3203+
<component group="org.bouncycastle" name="bcprov-jdk18on" version="1.77">
3204+
<artifact name="bcprov-jdk18on-1.77.jar">
3205+
<sha256 value="dabb98c24d72c9b9f585633d1df9c5cd58d9ad373d0cd681367e6a603a495d58" origin="Generated by Gradle"/>
3206+
</artifact>
3207+
</component>
32083208
<component group="org.bouncycastle" name="bctls-fips" version="1.0.9">
32093209
<artifact name="bctls-fips-1.0.9.jar">
32103210
<sha256 value="ada8549467dda0017e098f2362bd7f00841244351d1fc6f89b9da5ff25890151" origin="Generated by Gradle"/>
32113211
</artifact>
32123212
</component>
3213+
<component group="org.bouncycastle" name="bcutil-jdk18on" version="1.77">
3214+
<artifact name="bcutil-jdk18on-1.77.jar">
3215+
<sha256 value="947673bcbc5a8dde2d2fa688a5b7598d0ca6e2a74a7ea30cd93f04f6b3ad68f8" origin="Generated by Gradle"/>
3216+
</artifact>
3217+
</component>
32133218
<component group="org.carrot2" name="morfologik-fsa" version="2.1.1">
32143219
<artifact name="morfologik-fsa-2.1.1.jar">
32153220
<sha256 value="c91db33831762a305d6d30fbd4230d9e57798706e25c35222c9bee1eb3e00109" origin="Generated by Gradle"/>

plugins/ingest-attachment/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ dependencies {
4141
api "org.apache.pdfbox:fontbox:${versions.pdfbox}"
4242
api "org.apache.pdfbox:jempbox:1.8.16"
4343
api "commons-logging:commons-logging:${versions.commonslogging}"
44-
api "org.bouncycastle:bcmail-jdk15on:${versions.bouncycastle}"
45-
api "org.bouncycastle:bcprov-jdk15on:${versions.bouncycastle}"
46-
api "org.bouncycastle:bcpkix-jdk15on:${versions.bouncycastle}"
44+
api "org.bouncycastle:bcmail-jdk18on:${versions.bouncycastle}"
45+
api "org.bouncycastle:bcprov-jdk18on:${versions.bouncycastle}"
46+
api "org.bouncycastle:bcpkix-jdk18on:${versions.bouncycastle}"
4747
// OpenOffice
4848
api "org.apache.poi:poi-ooxml:${versions.poi}"
4949
api "org.apache.poi:poi:${versions.poi}"

plugins/ingest-attachment/licenses/bcmail-jdk15on-1.64.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
f2bb8aa55dc901ee8b8aae7d1007c03592d65e03
File renamed without changes.
File renamed without changes.

plugins/ingest-attachment/licenses/bcpkix-jdk15on-1.64.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ed953791ba0229747dd0fd9911e3d76a462acfd3

0 commit comments

Comments
 (0)