Skip to content

Update to Conscrypt 2.5.3 for 16 kB page size #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rfc2822 merged 2 commits into from
Jul 14, 2025
Merged

Update to Conscrypt 2.5.3 for 16 kB page size #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89997ca
Update to Conscrypt 2.5.3. `X509Certificate.toString()` is not used a…
rfc2822 Jul 14, 2025
cdf8b2d
Update Gradle tasks to use 'lib' instead of 'cert4android'
rfc2822 Jul 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-kdoc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- uses: gradle/actions/setup-gradle@v3

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

- name: Publish KDoc
if: success()
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
# uses: github/codeql-action/autobuild@v2

- name: Build
run: ./gradlew --no-daemon cert4android:assemble
run: ./gradlew --no-daemon lib:assemble

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- uses: gradle/actions/setup-gradle@v3

- name: Check
run: ./gradlew cert4android:check
run: ./gradlew lib:check

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

- name: Run device tests
run: ./gradlew --no-daemon virtualCheck
run: ./gradlew --no-daemon lib:virtualCheck
8 changes: 3 additions & 5 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
[versions]
agp = "8.11.0"
agp = "8.11.1"
androidx-activityCompose = "1.10.1"
androidx-appcompat = "1.7.1"
androidx-core = "1.16.0"
androidx-lifecycle = "2.9.1"
androidx-test-core = "1.6.1"
androidx-test-runner = "1.6.2"
androidx-test-rules = "1.6.1"
# don't update to 2.5.3 / until https://github.com/google/conscrypt/issues/1268 is fixed
#noinspection GradleDependency
conscrypt = "2.5.2"
conscrypt = "2.5.3"
compose-bom = "2025.06.01"
dokka = "1.9.20"
junit = "4.13.2"
kotlin = "2.2.0"
mockk = "1.14.4"
okhttp3 = "5.0.0"
okhttp3 = "5.1.0"

[libraries]
androidx-activityCompose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
Expand Down
8 changes: 7 additions & 1 deletion lib/src/androidTest/java/at/bitfire/cert4android/ConscryptTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,19 @@ class ConscryptTest {
}


/**
* Test for https://github.com/google/conscrypt/issues/1268.
*
* See also https://github.com/bitfireAT/cert4android/pull/48.
*/
@Test
fun test_X509Certificate_toString() {
val certFactory = CertificateFactory.getInstance("X.509")
val testCert = certFactory.generateCertificate(RAW_EXPIRED_CERT.byteInputStream()) as X509Certificate

// Crashes with Conscrypt 2.5.3
System.err.println(testCert.toString())
// Uncomment with Conscrypt >2.5.3
// System.err.println(testCert.toString())
}


Expand Down
Loading