diff options
| author | Matthias Sohn <matthias.sohn@gmail.com> | 2023-05-08 07:37:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-05-08 07:37:27 +0000 |
| commit | e0be35f503268bd3877d9ceb385fb2cfdbefdd3e (patch) | |
| tree | 86197fdd76419fed79767503914cb0a146e0071c | |
| parent | 4736d56aa47b77bf93d5ecad80ccb3b1e275506e (diff) | |
| parent | da82726b90346762052ac812a1142720e640cacc (diff) | |
Merge "Update bouncycastle to 1.72" into stable-3.5
| -rw-r--r-- | WORKSPACE | 20 | ||||
| -rw-r--r-- | java/com/google/gerrit/acceptance/BUILD | 1 | ||||
| -rw-r--r-- | lib/bouncycastle/BUILD | 15 |
3 files changed, 29 insertions, 7 deletions
@@ -742,24 +742,30 @@ maven_jar( ) # 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( diff --git a/java/com/google/gerrit/acceptance/BUILD b/java/com/google/gerrit/acceptance/BUILD index d03d0310c3..12c6837c15 100644 --- a/java/com/google/gerrit/acceptance/BUILD +++ b/java/com/google/gerrit/acceptance/BUILD @@ -55,6 +55,7 @@ DEPLOY_ENV = [ "//lib/bouncycastle:bcpg", "//lib/bouncycastle:bcpkix", "//lib/bouncycastle:bcprov", + "//lib/bouncycastle:bcutil", "//prolog:gerrit-prolog-common", ] diff --git a/lib/bouncycastle/BUILD b/lib/bouncycastle/BUILD index 43ba6e1cec..6a87d73c1b 100644 --- a/lib/bouncycastle/BUILD +++ b/lib/bouncycastle/BUILD @@ -22,6 +22,13 @@ java_library( ) 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 @@ java_library( visibility = ["//visibility:public"], exports = ["@bcpkix//jar"], ) + +java_library( + name = "bcutil-neverlink", + data = ["//lib:LICENSE-bouncycastle"], + neverlink = 1, + visibility = ["//visibility:public"], + exports = ["@bcutil//jar"], +) |