Skip to content

Handle conscrypt changes #9600

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
yschimke merged 2 commits into from
Jul 26, 2026
+12 −1
Merged

Handle conscrypt changes #9600

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2edba8a
Handle conscrypt changes
yschimke Jul 26, 2026
0a86294
reformat
yschimke Jul 26, 2026
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
13 changes: 12 additions & 1 deletion okhttp/src/jvmTest/kotlin/okhttp3/internal/connection/RetryConnectionTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import okhttp3.ConnectionSpec
import okhttp3.OkHttpClientTestRule
import okhttp3.TestValueFactory
import okhttp3.TlsVersion
import okhttp3.testing.PlatformRule
import okhttp3.tls.internal.TlsUtil.localhost
import org.junit.jupiter.api.AfterEach
import org.junit.jupiter.api.Test
Expand All @@ -42,6 +43,9 @@ class RetryConnectionTest {
@RegisterExtension
val clientTestRule = OkHttpClientTestRule()

@RegisterExtension
val platform = PlatformRule()

private var client = clientTestRule.newClient()

@AfterEach internal fun tearDown() {
Expand Down Expand Up @@ -98,7 +102,14 @@ class RetryConnectionTest {
// COMPATIBLE_TLS is used here.
socket = createSocketWithEnabledProtocols(*enabledSocketTlsVersions)
connectionSpecs[attempt1.connectionSpecIndex].apply(socket, attempt1.isTlsFallback)
assertEnabledProtocols(socket, TlsVersion.TLS_1_2, TlsVersion.TLS_1_1, TlsVersion.TLS_1_0)

if (platform.isConscrypt()) {
// Conscrypt 2.5.2 deprecated TLS 1.0 and 1.1, and 2.6 dropped them
assertEnabledProtocols(socket, TlsVersion.TLS_1_2)
} else {
assertEnabledProtocols(socket, TlsVersion.TLS_1_2, TlsVersion.TLS_1_1, TlsVersion.TLS_1_0)
}

val attempt2 = attempt1.nextConnectionSpec(connectionSpecs, socket)
assertThat(attempt2).isNull()
socket.close()
Expand Down
Loading