Use rustls via tokio-rustls re-export

This commit is contained in:
Matt Brubeck 2024-03-07 15:16:56 -08:00
parent 75cf6024b6
commit df41668b15
5 changed files with 15 additions and 12 deletions

View file

@ -1,16 +1,17 @@
use {
rustls::{
crypto::ring::sign::any_supported_type,
pki_types::{self, CertificateDer, PrivateKeyDer},
server::{ClientHello, ResolvesServerCert},
sign::{CertifiedKey, SigningKey},
},
std::{
ffi::OsStr,
fmt::{Display, Formatter},
path::Path,
sync::Arc,
},
tokio_rustls::rustls::{
self,
crypto::ring::sign::any_supported_type,
pki_types::{self, CertificateDer, PrivateKeyDer},
server::{ClientHello, ResolvesServerCert},
sign::{CertifiedKey, SigningKey},
},
};
/// A struct that holds all loaded certificates and the respective domain

View file

@ -10,7 +10,6 @@ use {
once_cell::sync::Lazy,
percent_encoding::{percent_decode_str, percent_encode, AsciiSet, CONTROLS},
rcgen::{Certificate, CertificateParams, DnType},
rustls::server::ServerConfig,
std::{
borrow::Cow,
error::Error,
@ -28,7 +27,11 @@ use {
runtime::Runtime,
sync::Mutex,
},
tokio_rustls::{server::TlsStream, TlsAcceptor},
tokio_rustls::{
rustls::{server::ServerConfig, version::TLS13},
server::TlsStream,
TlsAcceptor,
},
url::{Host, Url},
};
@ -408,7 +411,7 @@ static TLS: Lazy<TlsAcceptor> = Lazy::new(acceptor);
fn acceptor() -> TlsAcceptor {
let config = if ARGS.only_tls13 {
ServerConfig::builder_with_protocol_versions(&[&rustls::version::TLS13])
ServerConfig::builder_with_protocol_versions(&[&TLS13])
} else {
ServerConfig::builder()
}