File tree Expand file tree Collapse file tree 2 files changed +10
-7
lines changed
Expand file tree Collapse file tree 2 files changed +10
-7
lines changed Original file line number Diff line number Diff line change @@ -45,7 +45,7 @@ sealed interface VerificationResult {
4545
4646 data object ChallengeMismatch : VerificationResult
4747
48- data object PathValidationFailure : VerificationResult
48+ data class PathValidationFailure ( val cause : CertPathValidatorException ) : VerificationResult
4949
5050 data object ChainParsingFailure : VerificationResult
5151
@@ -118,7 +118,7 @@ open class Verifier(
118118 try {
119119 certPathValidator.validate(certPath, certPathParameters) as PKIXCertPathValidatorResult
120120 } catch (e: CertPathValidatorException ) {
121- return VerificationResult .PathValidationFailure
121+ return VerificationResult .PathValidationFailure (e)
122122 }
123123
124124 val keyDescription =
Original file line number Diff line number Diff line change @@ -22,6 +22,7 @@ import com.android.keyattestation.verifier.testing.TestUtils.prodAnchors
2222import com.android.keyattestation.verifier.testing.TestUtils.readCertPath
2323import com.google.common.truth.Truth.assertThat
2424import com.google.protobuf.ByteString
25+ import java.security.cert.PKIXReason
2526import java.time.Instant
2627import kotlin.test.assertIs
2728import org.junit.Test
@@ -93,11 +94,13 @@ class VerifierTest {
9394
9495 @Test
9596 fun verify_unexpectedRootKey_returnsPathValidationFailure () {
96- assertIs<VerificationResult .PathValidationFailure >(
97- verifier.verify(
98- CertLists .wrongTrustAnchor,
99- ChallengeMatcher (ByteString .copyFromUtf8(" challenge" )),
97+ val result =
98+ assertIs<VerificationResult .PathValidationFailure >(
99+ verifier.verify(
100+ CertLists .wrongTrustAnchor,
101+ ChallengeMatcher (ByteString .copyFromUtf8(" challenge" )),
102+ )
100103 )
101- )
104+ assertThat(result.cause.reason).isEqualTo( PKIXReason . NO_TRUST_ANCHOR )
102105 }
103106}
You can’t perform that action at this time.
0 commit comments