From a3d3cc72140105b9f7ea0321af839b7e0ca04a8a Mon Sep 17 00:00:00 2001 From: int 80h Date: Tue, 21 Apr 2020 21:09:57 -0400 Subject: [PATCH] Moved function to another file --- src/main.rs | 11 +---------- src/tls.rs | 9 +++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main.rs b/src/main.rs index fc7861a..0a1c0c6 100644 --- a/src/main.rs +++ b/src/main.rs @@ -25,15 +25,6 @@ use url::Url; mod config; mod tls; -fn get_tls_config(cfg: config::Config) -> rustls::ServerConfig { - let store = rustls::RootCertStore::empty(); - let verifier = rustls::AllowAnyAnonymousOrAuthenticatedClient::new(store); - let mut tls_config = rustls::ServerConfig::new(verifier); - tls_config.cert_resolver = Arc::new(tls::CertResolver::from_config(cfg).unwrap()); - - tls_config -} - fn get_content(mut path: PathBuf, u: url::Url) -> Result { let meta = fs::metadata(&path).expect("Unable to read metadata"); if meta.is_file() { @@ -132,7 +123,7 @@ fn main() -> io::Result<()> { .build()?; let handle = runtime.handle().clone(); - let config = get_tls_config(cfg.clone()); + let config = tls::get_tls_config(cfg.clone()); let acceptor = TlsAcceptor::from(Arc::new(config)); diff --git a/src/tls.rs b/src/tls.rs index 814f55f..c2b45d9 100644 --- a/src/tls.rs +++ b/src/tls.rs @@ -13,6 +13,15 @@ use tokio_rustls::rustls::{Certificate, NoClientAuth, PrivateKey, ServerConfig}; use crate::config; +pub fn get_tls_config(cfg: config::Config) -> rustls::ServerConfig { + let store = rustls::RootCertStore::empty(); + let verifier = rustls::AllowAnyAnonymousOrAuthenticatedClient::new(store); + let mut tls_config = rustls::ServerConfig::new(verifier); + tls_config.cert_resolver = Arc::new(CertResolver::from_config(cfg).unwrap()); + + tls_config +} + pub fn load_certs(path: &String) -> io::Result> { certs(&mut BufReader::new(File::open(path)?)) .map_err(|_| io::Error::new(io::ErrorKind::InvalidInput, "invalid cert"))