commit da82726b90346762052ac812a1142720e640cacc
author Matthias Sohn <matthias.sohn@sap.com> Thu Sep 15 12:06:07 2022 +0200
committer Nasser Grainawi <nasser.grainawi@linaro.org> Thu May 04 08:17:16 2023 -0700
tree 28b9c09438b8a96b41ebc77065b82eda0eb5bad0
parent b0f6f762bbb8fec35a2230656060155e9a7059ff

Update bouncycastle to 1.72

The recent versions fixed number of defects and added new features: [1].
Most notably it also fixed number of issues with Ed25519 keys and signed
certificates:

- OpenSSH: Fixed padding in generated Ed25519 private keys.
- Support has been added for generating Ed25519/Ed448 signed
  certificates.
- Bouncycastle 1.69 added bcutil as a new artefact which bcpkix depends
  on
- 1.71: the new jdk18on jars are compiled to work with anything starting
  from Java 1.8
- JGit 6.4.0 uses bouncycastle 1.72

This commit also includes the update done in change Id86bdb188.

[1] https://www.bouncycastle.org/releasenotes.html

Bug: Issue 12089
Release-Notes: Update bouncycastle to 1.72
Change-Id: I846f51d83de5e0fec27022a7bc2927260f4465be
(cherry picked from commit 15f581a383365c850ebec78a8f5dc427bd2ae951)

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index b3bf30b..af35854 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -742,24 +742,30 @@
 )
 
 # When updating Bouncy Castle, also update it in bazlets.
-BC_VERS = "1.61"
+BC_VERS = "1.72"
 
 maven_jar(
     name = "bcprov",
-    artifact = "org.bouncycastle:bcprov-jdk15on:" + BC_VERS,
-    sha1 = "00df4b474e71be02c1349c3292d98886f888d1f7",
+    artifact = "org.bouncycastle:bcprov-jdk18on:" + BC_VERS,
+    sha1 = "d8dc62c28a3497d29c93fee3e71c00b27dff41b4",
 )
 
 maven_jar(
     name = "bcpg",
-    artifact = "org.bouncycastle:bcpg-jdk15on:" + BC_VERS,
-    sha1 = "422656435514ab8a28752b117d5d2646660a0ace",
+    artifact = "org.bouncycastle:bcpg-jdk18on:" + BC_VERS,
+    sha1 = "1a36a1740d07869161f6f0d01fae8d72dd1d8320",
 )
 
 maven_jar(
     name = "bcpkix",
-    artifact = "org.bouncycastle:bcpkix-jdk15on:" + BC_VERS,
-    sha1 = "89bb3aa5b98b48e584eee2a7401b7682a46779b4",
+    artifact = "org.bouncycastle:bcpkix-jdk18on:" + BC_VERS,
+    sha1 = "bb3fdb5162ccd5085e8d7e57fada4d8eaa571f5a",
+)
+
+maven_jar(
+    name = "bcutil",
+    artifact = "org.bouncycastle:bcutil-jdk18on:" + BC_VERS,
+    sha1 = "41f19a69ada3b06fa48781120d8bebe1ba955c77",
 )
 
 maven_jar(

java/com/google/gerrit/acceptance/BUILD

diff --git a/java/com/google/gerrit/acceptance/BUILD b/java/com/google/gerrit/acceptance/BUILD
index d03d0310c..12c6837 100644
--- a/java/com/google/gerrit/acceptance/BUILD
+++ b/java/com/google/gerrit/acceptance/BUILD
@@ -55,6 +55,7 @@
     "//lib/bouncycastle:bcpg",
     "//lib/bouncycastle:bcpkix",
     "//lib/bouncycastle:bcprov",
+    "//lib/bouncycastle:bcutil",
     "//prolog:gerrit-prolog-common",
 ]
 

lib/bouncycastle/BUILD

diff --git a/lib/bouncycastle/BUILD b/lib/bouncycastle/BUILD
index 43ba6e1..6a87d73 100644
--- a/lib/bouncycastle/BUILD
+++ b/lib/bouncycastle/BUILD
@@ -22,6 +22,13 @@
 )
 
 java_library(
+    name = "bcutil",
+    data = ["//lib:LICENSE-bouncycastle"],
+    visibility = ["//visibility:public"],
+    exports = ["@bcutil//jar"],
+)
+
+java_library(
     name = "bcprov-neverlink",
     data = ["//lib:LICENSE-bouncycastle"],
     neverlink = 1,
@@ -44,3 +51,11 @@
     visibility = ["//visibility:public"],
     exports = ["@bcpkix//jar"],
 )
+
+java_library(
+    name = "bcutil-neverlink",
+    data = ["//lib:LICENSE-bouncycastle"],
+    neverlink = 1,
+    visibility = ["//visibility:public"],
+    exports = ["@bcutil//jar"],
+)