error: lift out certificate error mapping

For consistency with other many-variant sub-error mappings.

Author: cpu

librustls/src/error.rs

@@ -571,21 +571,7 @@ pub(crate) fn map_error(input: Error) -> rustls_result {
         Error::NoApplicationProtocol => NoApplicationProtocol,
         Error::BadMaxFragmentSize => BadMaxFragmentSize,
 
-        Error::InvalidCertificate(e) => match e {
-            CertificateError::BadEncoding => CertEncodingBad,
-            CertificateError::Expired => CertExpired,
-            CertificateError::NotValidYet => CertNotYetValid,
-            CertificateError::Revoked => CertRevoked,
-            CertificateError::UnhandledCriticalExtension => CertUnhandledCriticalExtension,
-            CertificateError::UnknownIssuer => CertUnknownIssuer,
-            CertificateError::UnknownRevocationStatus => CertUnknownRevocationStatus,
-            CertificateError::ExpiredRevocationList => CertExpiredRevocationList,
-            CertificateError::BadSignature => CertBadSignature,
-            CertificateError::NotValidForName => CertNotValidForName,
-            CertificateError::InvalidPurpose => CertInvalidPurpose,
-            CertificateError::ApplicationVerificationFailure => CertApplicationVerificationFailure,
-            _ => CertOtherError,
-        },
+        Error::InvalidCertificate(e) => map_invalid_certificate_error(e),
 
         Error::General(_) => General,
 
@@ -733,6 +719,26 @@ fn map_invalid_message_error(err: InvalidMessage) -> rustls_result {
     }
 }
 
+fn map_invalid_certificate_error(err: CertificateError) -> rustls_result {
+    use rustls_result::*;
+
+    match err {
+        CertificateError::BadEncoding => CertEncodingBad,
+        CertificateError::Expired => CertExpired,
+        CertificateError::NotValidYet => CertNotYetValid,
+        CertificateError::Revoked => CertRevoked,
+        CertificateError::UnhandledCriticalExtension => CertUnhandledCriticalExtension,
+        CertificateError::UnknownIssuer => CertUnknownIssuer,
+        CertificateError::UnknownRevocationStatus => CertUnknownRevocationStatus,
+        CertificateError::ExpiredRevocationList => CertExpiredRevocationList,
+        CertificateError::BadSignature => CertBadSignature,
+        CertificateError::NotValidForName => CertNotValidForName,
+        CertificateError::InvalidPurpose => CertInvalidPurpose,
+        CertificateError::ApplicationVerificationFailure => CertApplicationVerificationFailure,
+        _ => CertOtherError,
+    }
+}
+
 fn map_ech_error(err: EncryptedClientHelloError) -> rustls_result {
     use rustls_result::*;