Skip to content

Commit 89997ca

Browse files
committed
Update to Conscrypt 2.5.3. X509Certificate.toString() is not used anywhere so it shouldn't crash.
1 parent e1b1ad5 commit 89997ca

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

gradle/libs.versions.toml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
[versions]
2-
agp = "8.11.0"
2+
agp = "8.11.1"
33
androidx-activityCompose = "1.10.1"
44
androidx-appcompat = "1.7.1"
55
androidx-core = "1.16.0"
66
androidx-lifecycle = "2.9.1"
77
androidx-test-core = "1.6.1"
88
androidx-test-runner = "1.6.2"
99
androidx-test-rules = "1.6.1"
10-
# don't update to 2.5.3 / until https://github.com/google/conscrypt/issues/1268 is fixed
11-
#noinspection GradleDependency
12-
conscrypt = "2.5.2"
10+
conscrypt = "2.5.3"
1311
compose-bom = "2025.06.01"
1412
dokka = "1.9.20"
1513
junit = "4.13.2"
1614
kotlin = "2.2.0"
1715
mockk = "1.14.4"
18-
okhttp3 = "5.0.0"
16+
okhttp3 = "5.1.0"
1917

2018
[libraries]
2119
androidx-activityCompose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }

lib/src/androidTest/java/at/bitfire/cert4android/ConscryptTest.kt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,19 @@ class ConscryptTest {
1313
}
1414

1515

16+
/**
17+
* Test for https://github.com/google/conscrypt/issues/1268.
18+
*
19+
* See also https://github.com/bitfireAT/cert4android/pull/48.
20+
*/
1621
@Test
1722
fun test_X509Certificate_toString() {
1823
val certFactory = CertificateFactory.getInstance("X.509")
1924
val testCert = certFactory.generateCertificate(RAW_EXPIRED_CERT.byteInputStream()) as X509Certificate
2025

2126
// Crashes with Conscrypt 2.5.3
22-
System.err.println(testCert.toString())
27+
// Uncomment with Conscrypt >2.5.3
28+
// System.err.println(testCert.toString())
2329
}
2430

2531

0 commit comments

Comments
 (0)