Skip to content

Commit b207d5e

Browse files
committed
error: properly map new CertificateError::*Context errs
For now we don't have a nice way to expose the details, but we can at least consistently map them to the relevant `rustls_result` instead of the catch-all `RUSTLS_RESULT_GENERAL`.
1 parent f82c3d9 commit b207d5e

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

librustls/src/error.rs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -729,15 +729,20 @@ fn map_invalid_certificate_error(err: CertificateError) -> rustls_result {
729729

730730
match err {
731731
CertificateError::BadEncoding => CertEncodingBad,
732-
CertificateError::Expired => CertExpired,
733-
CertificateError::NotValidYet => CertNotYetValid,
732+
CertificateError::Expired | CertificateError::ExpiredContext { .. } => CertExpired,
733+
CertificateError::NotValidYet | CertificateError::NotValidYetContext { .. } => {
734+
CertNotYetValid
735+
}
734736
CertificateError::Revoked => CertRevoked,
735737
CertificateError::UnhandledCriticalExtension => CertUnhandledCriticalExtension,
736738
CertificateError::UnknownIssuer => CertUnknownIssuer,
737739
CertificateError::UnknownRevocationStatus => CertUnknownRevocationStatus,
738-
CertificateError::ExpiredRevocationList => CertExpiredRevocationList,
740+
CertificateError::ExpiredRevocationList
741+
| CertificateError::ExpiredRevocationListContext { .. } => CertExpiredRevocationList,
739742
CertificateError::BadSignature => CertBadSignature,
740-
CertificateError::NotValidForName => CertNotValidForName,
743+
CertificateError::NotValidForName | CertificateError::NotValidForNameContext { .. } => {
744+
CertNotValidForName
745+
}
741746
CertificateError::InvalidPurpose => CertInvalidPurpose,
742747
CertificateError::ApplicationVerificationFailure => CertApplicationVerificationFailure,
743748
_ => CertOtherError,

0 commit comments

Comments
 (0)