Skip to content

Commit 55903a1

Browse files
authored
Update to Conscrypt 2.5.3 for 16 kB page size (#56)
* Update to Conscrypt 2.5.3. `X509Certificate.toString()` is not used anywhere so it shouldn't crash. * Update Gradle tasks to use 'lib' instead of 'cert4android'
1 parent e1b1ad5 commit 55903a1

File tree

5 files changed

+14
-10
lines changed

5 files changed

+14
-10
lines changed

.github/workflows/build-kdoc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- uses: gradle/actions/setup-gradle@v3
2424

2525
- name: Build KDoc
26-
run: ./gradlew --no-daemon --no-configuration-cache cert4android:dokkaHtml
26+
run: ./gradlew --no-daemon --no-configuration-cache lib:dokkaHtml
2727

2828
- name: Publish KDoc
2929
if: success()

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
# uses: github/codeql-action/autobuild@v2
5454

5555
- name: Build
56-
run: ./gradlew --no-daemon cert4android:assemble
56+
run: ./gradlew --no-daemon lib:assemble
5757

5858
- name: Perform CodeQL Analysis
5959
uses: github/codeql-action/analyze@v3

.github/workflows/test-dev.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- uses: gradle/actions/setup-gradle@v3
1919

2020
- name: Check
21-
run: ./gradlew cert4android:check
21+
run: ./gradlew lib:check
2222

2323
test_on_emulator:
2424
name: Tests with emulator
@@ -45,4 +45,4 @@ jobs:
4545
key: avd-${{ hashFiles('lib/build.gradle.kts') }} # gradle-managed devices are defined there
4646

4747
- name: Run device tests
48-
run: ./gradlew --no-daemon virtualCheck
48+
run: ./gradlew --no-daemon lib:virtualCheck

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)