Skip to content

Android 16 checkServerTrusted NPE mitigation #160

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

Draft
aniruddhaepifi wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Android 16 checkServerTrusted NPE mitigation #160

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
14af577
Added a fallback function, since it seems like in some OEM versions o…
aniruddhaepifi Oct 29, 2025
38c4cd7
Merge branch 'main' into android16_servertrusted_fallback
aniruddhaepifi Nov 10, 2025
f1b689f
restore modules.xml
aniruddhaepifi Nov 10, 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
24 changes: 23 additions & 1 deletion .../certificatetransparency/internal/verifier/CertificateTransparencyTrustManagerExtended.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ internal class CertificateTransparencyTrustManagerExtended(
}

private val checkServerTrustedMethodApi36: Method? = try {
println("checkServerTrustedMethodApi36: availableMethods: ${delegate::class.java.declaredMethods.joinToString("\n") { method ->
"${method.name}(${method.genericParameterTypes.joinToString { it.typeName }}): ${method.genericReturnType.typeName}"
}}")
delegate::class.java.getDeclaredMethod(
"checkServerTrusted",
Array<X509Certificate>::class.java,
Expand All @@ -88,6 +91,20 @@ internal class CertificateTransparencyTrustManagerExtended(
null
}

private val checkServerTrustedMethodApi36Fallback: Method? = try {
println("checkServerTrustedMethodApi36: availableMethods: ${delegate::class.java.declaredMethods.joinToString("\n") { method ->
"${method.name}(${method.genericParameterTypes.joinToString { it.typeName }}): ${method.genericReturnType.typeName}"
}}")
delegate::class.java.getDeclaredMethod(
"checkServerTrusted",
Array<X509Certificate>::class.java,
String::class.java,
String::class.java
)
} catch (ignored: NoSuchMethodException) {
null
}

private val isSameTrustConfigurationMethod: Method? = try {
delegate::class.java.getDeclaredMethod("isSameTrustConfiguration", String::class.java, String::class.java)
} catch (ignored: NoSuchMethodException) {
Expand Down Expand Up @@ -188,7 +205,12 @@ internal class CertificateTransparencyTrustManagerExtended(
host: String
): List<X509Certificate> {
@Suppress("UNCHECKED_CAST")
val certs = checkServerTrustedMethodApi36!!.invoke(delegate, chain, ocspData, tlsSctData, authType, host) as List<X509Certificate>
val certs = try {
checkServerTrustedMethodApi36!!.invoke(delegate, chain, ocspData, tlsSctData, authType, host) as List<X509Certificate>
} catch (e: Exception) {
e.printStackTrace()
checkServerTrustedMethodApi36Fallback!!.invoke(delegate, chain, authType, host) as List<X509Certificate>
}

val result = verifyCertificateTransparency(host, certs.toList())

Expand Down