mirrors/doh-server
1
0
Fork 0
mirror of https://github.com/DNSCrypt/doh-server.git synced 2025-04-05 14:07:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Uglify

Browse source
This commit is contained in:
Frank Denis 2021-10-29 20:23:41 +02:00
parent 46be8b9662
commit d586c50019
1 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/libdoh/src/tls.rs
View file

@ -30,8 +30,7 @@ where
e.kind(), e.kind(),
format!( format!(
"Unable to load the certificates [{}]: {}", "Unable to load the certificates [{}]: {}",
certs_path_str, certs_path_str, e
e
), ),
) )
})?); })?);
@ -55,8 +54,7 @@ where
e.kind(), e.kind(),
format!( format!(
"Unable to load the certificate keys [{}]: {}", "Unable to load the certificate keys [{}]: {}",
certs_keys_path_str, certs_keys_path_str, e
e
), ),
) )
})? })?
@ -88,17 +86,21 @@ where
keys.drain(..).map(PrivateKey).collect() keys.drain(..).map(PrivateKey).collect()
}; };
let mut server_config = None; let mut server_config = certs_keys
for certs_key in certs_keys { .into_iter()
.find_map(|certs_key| {
let server_config_builder = ServerConfig::builder() let server_config_builder = ServerConfig::builder()
.with_safe_defaults() .with_safe_defaults()
.with_no_client_auth(); .with_no_client_auth();
if let Ok(found_config) = server_config_builder.with_single_cert(certs.clone(), certs_key) { if let Ok(found_config) =
server_config = Some(found_config); server_config_builder.with_single_cert(certs.clone(), certs_key)
break; {
Some(found_config)
} else {
None
} }
} })
let mut server_config = server_config.ok_or_else(|| { .ok_or_else(|| {
io::Error::new( io::Error::new(
io::ErrorKind::InvalidInput, io::ErrorKind::InvalidInput,
"Unable to find a valid certificate and key", "Unable to find a valid certificate and key",