Skip to content

Commit fd4a190

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 51ded53 commit fd4a190

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
@@ -730,15 +730,20 @@ fn map_invalid_certificate_error(err: CertificateError) -> rustls_result {
730730

731731
match err {
732732
CertificateError::BadEncoding => CertEncodingBad,
733-
CertificateError::Expired => CertExpired,
734-
CertificateError::NotValidYet => CertNotYetValid,
733+
CertificateError::Expired | CertificateError::ExpiredContext { .. } => CertExpired,
734+
CertificateError::NotValidYet | CertificateError::NotValidYetContext { .. } => {
735+
CertNotYetValid
736+
}
735737
CertificateError::Revoked => CertRevoked,
736738
CertificateError::UnhandledCriticalExtension => CertUnhandledCriticalExtension,
737739
CertificateError::UnknownIssuer => CertUnknownIssuer,
738740
CertificateError::UnknownRevocationStatus => CertUnknownRevocationStatus,
739-
CertificateError::ExpiredRevocationList => CertExpiredRevocationList,
741+
CertificateError::ExpiredRevocationList
742+
| CertificateError::ExpiredRevocationListContext { .. } => CertExpiredRevocationList,
740743
CertificateError::BadSignature => CertBadSignature,
741-
CertificateError::NotValidForName => CertNotValidForName,
744+
CertificateError::NotValidForName | CertificateError::NotValidForNameContext { .. } => {
745+
CertNotValidForName
746+
}
742747
CertificateError::InvalidPurpose => CertInvalidPurpose,
743748
CertificateError::ApplicationVerificationFailure => CertApplicationVerificationFailure,
744749
_ => CertOtherError,

0 commit comments

Comments
 (0)