From 66fdd36566b727fd75a7bd31652db3c8cd1beb57 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 24 Jul 2026 11:22:04 +0000
Subject: [PATCH 1/2] Update org.bouncycastle

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 06bce4a8b7fe..14be5abb1bb7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -43,7 +43,7 @@ maven-sympathy = "0.3.0"
 mockserver-client = "5.15.0"
 mrjar = "0.1.1"
 openjsse = "1.1.14"
-org-bouncycastle = "1.84"
+org-bouncycastle = "1.85"
 org-conscrypt = "2.6.1"
 org-junit-jupiter = "5.13.4"
 playservices-safetynet = "18.1.0"

From 03117063087c67d46cb6125d82de7400bc26283f Mon Sep 17 00:00:00 2001
From: Yuri Schimke <yuri@schimke.ee>
Date: Tue, 28 Jul 2026 09:22:51 +0100
Subject: [PATCH 2/2] Upgrade and fix issues with BC versions

---
 android-test/build.gradle.kts           | 1 +
 gradle/libs.versions.toml               | 4 +++-
 okhttp-testing-support/build.gradle.kts | 1 +
 okhttp/build.gradle.kts                 | 2 ++
 regression-test/build.gradle.kts        | 1 +
 5 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/android-test/build.gradle.kts b/android-test/build.gradle.kts
index bc0e5212c78b..e252bfb6c174 100644
--- a/android-test/build.gradle.kts
+++ b/android-test/build.gradle.kts
@@ -101,6 +101,7 @@ dependencies {
   }
   androidTestImplementation(libs.assertk)
   androidTestImplementation(libs.bouncycastle.bcprov)
+  androidTestImplementation(libs.bouncycastle.bcutil)
   androidTestImplementation(libs.bouncycastle.bctls)
   androidTestImplementation(libs.conscrypt.android)
   androidTestImplementation(projects.mockwebserver3Junit4)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 14be5abb1bb7..50e5579bf84b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -44,6 +44,7 @@ mockserver-client = "5.15.0"
 mrjar = "0.1.1"
 openjsse = "1.1.14"
 org-bouncycastle = "1.85"
+org-bouncycastle-patch = "1.85.1"
 org-conscrypt = "2.6.1"
 org-junit-jupiter = "5.13.4"
 playservices-safetynet = "18.1.0"
@@ -80,7 +81,8 @@ aqute-bnd = { module = "biz.aQute.bnd:biz.aQute.bnd", version.ref = "bnd" }
 aqute-resolve = { module = "biz.aQute.bnd:biz.aQute.resolve", version.ref = "bnd" }
 assertk = { module = "com.willowtreeapps.assertk:assertk", version.ref = "assertk" }
 bouncycastle-bcpkix = { module = "org.bouncycastle:bcpkix-jdk15to18", version.ref = "org-bouncycastle" }
-bouncycastle-bcprov = { module = "org.bouncycastle:bcprov-jdk15to18", version.ref = "org-bouncycastle" }
+bouncycastle-bcprov = { module = "org.bouncycastle:bcprov-jdk15to18", version.ref = "org-bouncycastle-patch" }
+bouncycastle-bcutil = { module = "org.bouncycastle:bcutil-jdk15to18", version.ref = "org-bouncycastle-patch" }
 bouncycastle-bctls = { module = "org.bouncycastle:bctls-jdk15to18", version.ref = "org-bouncycastle" }
 brotli-dec = { module = "org.brotli:dec", version.ref = "brotli-dec" }
 checkstyle = { module = "com.puppycrawl.tools:checkstyle", version.ref = "checkstyle" }
diff --git a/okhttp-testing-support/build.gradle.kts b/okhttp-testing-support/build.gradle.kts
index c132d91e946b..7ae2e261c939 100644
--- a/okhttp-testing-support/build.gradle.kts
+++ b/okhttp-testing-support/build.gradle.kts
@@ -15,6 +15,7 @@ dependencies {
   api(libs.assertk)
   api(libs.bouncycastle.bcprov)
   implementation(libs.bouncycastle.bcpkix)
+  implementation(libs.bouncycastle.bcutil)
   implementation(libs.bouncycastle.bctls)
   api(libs.conscrypt.openjdk)
   api(libs.openjsse)
diff --git a/okhttp/build.gradle.kts b/okhttp/build.gradle.kts
index 15d24f092949..0d777778ca84 100644
--- a/okhttp/build.gradle.kts
+++ b/okhttp/build.gradle.kts
@@ -119,6 +119,7 @@ kotlin {
       dependsOn(commonJvmAndroid)
       dependencies {
         compileOnly(libs.bouncycastle.bcprov)
+        compileOnly(libs.bouncycastle.bcutil)
         compileOnly(libs.bouncycastle.bctls)
         compileOnly(libs.conscrypt.openjdk)
         implementation(libs.androidx.annotation)
@@ -133,6 +134,7 @@ kotlin {
         // These compileOnly dependencies must also be listed in applyOsgiMultiplatform() below.
         compileOnly(libs.conscrypt.openjdk)
         compileOnly(libs.bouncycastle.bcprov)
+        compileOnly(libs.bouncycastle.bcutil)
         compileOnly(libs.bouncycastle.bctls)
 
         // graal build support
diff --git a/regression-test/build.gradle.kts b/regression-test/build.gradle.kts
index 522294381bd0..ca772a12ed3b 100644
--- a/regression-test/build.gradle.kts
+++ b/regression-test/build.gradle.kts
@@ -43,6 +43,7 @@ dependencies {
   }
   androidTestImplementation("com.squareup.okhttp3:mockwebserver:${okhttpLegacyVersion}")
   androidTestImplementation(libs.bouncycastle.bcprov)
+  androidTestImplementation(libs.bouncycastle.bcutil)
   androidTestImplementation(libs.bouncycastle.bctls)
   androidTestImplementation(libs.androidx.junit)
   androidTestImplementation(libs.androidx.espresso.core)