error: map InvalidEncryptedClientHello errors

We added `rustls_result` entries for these, but weren't mapping them
correctly, always returning `RUSTLS_RESULT_GENERAL` errors for anything
that was a `rustls::EncryptedClientHello(_)` instance.

Author: cpu

librustls/src/error.rs

@@ -432,6 +432,8 @@ pub(crate) fn map_error(input: Error) -> rustls_result {
         Error::InconsistentKeys(InconsistentKeys::KeyMismatch) => InconsistentKeysKeysMismatch,
         Error::InconsistentKeys(InconsistentKeys::Unknown) => InconsistentKeysUnknown,
 
+        Error::InvalidEncryptedClientHello(err) => map_ech_error(err),
+
         _ => General,
     }
 }
@@ -461,6 +463,21 @@ pub(crate) fn map_crl_error(err: CertRevocationListError) -> rustls_result {
     }
 }
 
+pub(crate) fn map_ech_error(err: EncryptedClientHelloError) -> rustls_result {
+    use rustls_result::*;
+
+    match err {
+        EncryptedClientHelloError::InvalidConfigList => {
+            InvalidEncryptedClientHelloInvalidConfigList
+        }
+        EncryptedClientHelloError::NoCompatibleConfig => {
+            InvalidEncryptedClientHelloNoCompatibleConfig
+        }
+        EncryptedClientHelloError::SniRequired => InvalidEncryptedClientHelloSniRequired,
+        _ => General,
+    }
+}
+
 pub(crate) fn map_verifier_builder_error(err: VerifierBuilderError) -> rustls_result {
     match err {
         VerifierBuilderError::NoRootAnchors => {