Skip to content

Commit bf2cdef

Browse files
richard-dennehysarog
authored andcommitted
bump bcpkix version (elastic#132853) (elastic#133627)
(cherry picked from commit 049d1f3)
1 parent 8e78f8e commit bf2cdef

File tree

4 files changed

+25
-5
lines changed

4 files changed

+25
-5
lines changed

build-tools-internal/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ reactive_streams = 1.0.4
2222

2323
antlr4 = 4.13.1
2424
# bouncy castle version for non-fips. fips jars use a different version
25-
bouncycastle=1.78.1
25+
bouncycastle=1.79
2626
# used by security and idp (need to be in sync due to cross-dependency in testing)
2727
opensaml = 4.3.0
2828

docs/changelog/132853.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 132853
2+
summary: Bump bcpkix version
3+
area: Security
4+
type: upgrade
5+
issues: []

gradle/verification-metadata.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3408,6 +3408,11 @@
34083408
<sha256 value="4b48ea084e5232b9d79ebca1887b9de037b124931807cd60710748c2aee08cc9" origin="Generated by Gradle"/>
34093409
</artifact>
34103410
</component>
3411+
<component group="org.bouncycastle" name="bcpkix-jdk18on" version="1.79">
3412+
<artifact name="bcpkix-jdk18on-1.79.jar">
3413+
<sha256 value="3639a24ddf9ba4b7eba0659b44770e91eba816421888e571f285aadefe532cd6" origin="Generated by Gradle"/>
3414+
</artifact>
3415+
</component>
34113416
<component group="org.bouncycastle" name="bcprov-jdk15on" version="1.60">
34123417
<artifact name="bcprov-jdk15on-1.60.jar">
34133418
<sha256 value="7f1a0e6badab38666f8467a9a0ee96656b2f8ec8623867ed34f3cdc173b7ee07" origin="Generated by Gradle"/>
@@ -3423,6 +3428,11 @@
34233428
<sha256 value="add5915e6acfc6ab5836e1fd8a5e21c6488536a8c1f21f386eeb3bf280b702d7" origin="Generated by Gradle"/>
34243429
</artifact>
34253430
</component>
3431+
<component group="org.bouncycastle" name="bcprov-jdk18on" version="1.79">
3432+
<artifact name="bcprov-jdk18on-1.79.jar">
3433+
<sha256 value="0d81ecc3124536b539bce9aa3fe9621b7f84c9cee371b635a5b31c78b79ab1da" origin="Generated by Gradle"/>
3434+
</artifact>
3435+
</component>
34263436
<component group="org.bouncycastle" name="bctls-fips" version="1.0.19">
34273437
<artifact name="bctls-fips-1.0.19.jar">
34283438
<sha256 value="a0bbad2eb5268f1baa08f0e2e69cb61cd292e19e73595c620d586d335d97d1a8" origin="Generated by Gradle"/>
@@ -3433,6 +3443,11 @@
34333443
<sha256 value="d9fa56f97b0f761ce3bc8d9d74c5d7137a987bf5bd3abfe1003f9bafa45a1d2f" origin="Generated by Gradle"/>
34343444
</artifact>
34353445
</component>
3446+
<component group="org.bouncycastle" name="bcutil-jdk18on" version="1.79">
3447+
<artifact name="bcutil-jdk18on-1.79.jar">
3448+
<sha256 value="c70b88ada58938cbc2f005d40329054078bcfa1149e6ffc03e9242eb6ab21836" origin="Generated by Gradle"/>
3449+
</artifact>
3450+
</component>
34363451
<component group="org.carrot2" name="morfologik-fsa" version="2.1.1">
34373452
<artifact name="morfologik-fsa-2.1.1.jar">
34383453
<sha256 value="c91db33831762a305d6d30fbd4230d9e57798706e25c35222c9bee1eb3e00109" origin="Generated by Gradle"/>

qa/packaging/src/test/java/org/elasticsearch/packaging/test/ArchiveTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,14 +212,14 @@ public void test50AutoConfigurationFailsWhenCertificatesNotGenerated() throws Ex
212212
FileUtils.assertPathsDoNotExist(installation.data);
213213
Path tempDir = createTempDir("bc-backup");
214214
Files.move(
215-
installation.lib.resolve("tools").resolve("security-cli").resolve("bcprov-jdk18on-1.78.1.jar"),
216-
tempDir.resolve("bcprov-jdk18on-1.78.1.jar")
215+
installation.lib.resolve("tools").resolve("security-cli").resolve("bcprov-jdk18on-1.79.jar"),
216+
tempDir.resolve("bcprov-jdk18on-1.79.jar")
217217
);
218218
Shell.Result result = runElasticsearchStartCommand(null, false, false);
219219
assertElasticsearchFailure(result, "java.lang.NoClassDefFoundError: org/bouncycastle/", null);
220220
Files.move(
221-
tempDir.resolve("bcprov-jdk18on-1.78.1.jar"),
222-
installation.lib.resolve("tools").resolve("security-cli").resolve("bcprov-jdk18on-1.78.1.jar")
221+
tempDir.resolve("bcprov-jdk18on-1.79.jar"),
222+
installation.lib.resolve("tools").resolve("security-cli").resolve("bcprov-jdk18on-1.79.jar")
223223
);
224224
Platforms.onWindows(() -> sh.chown(installation.config));
225225
FileUtils.rm(tempDir);

0 commit comments

Comments
 (0)