rwf2
/
Rocket
mirror of https://github.com/rwf2/Rocket.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update 'rustls' to 0.21, 'tokio-rustls' to 0.24.

This commit is contained in:
Sergio Benitez 2023-03-31 12:08:45 -07:00
parent 1a66e50be0
commit fbb0ace529
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/http/Cargo.toml
View File

@ -30,8 +30,8 @@ percent-encoding = "2"
http = "0.2" http = "0.2"
time = { version = "0.3", features = ["formatting", "macros"] } time = { version = "0.3", features = ["formatting", "macros"] }
indexmap = { version = "1.5.2", features = ["std"] } indexmap = { version = "1.5.2", features = ["std"] }
rustls = { version = "0.20", optional = true } rustls = { version = "0.21", optional = true }
tokio-rustls = { version = "0.23.4", optional = true } tokio-rustls = { version = "0.24", optional = true }
rustls-pemfile = { version = "1.0.2", optional = true } rustls-pemfile = { version = "1.0.2", optional = true }
tokio = { version = "1.6.1", features = ["net", "sync", "time"] } tokio = { version = "1.6.1", features = ["net", "sync", "time"] }
log = "0.4" log = "0.4"

6
core/http/src/tls/listener.rs
View File

@ -86,11 +86,11 @@ impl TlsListener {
let client_auth = match c.ca_certs { let client_auth = match c.ca_certs {
Some(ref mut ca_certs) => match load_ca_certs(ca_certs) { Some(ref mut ca_certs) => match load_ca_certs(ca_certs) {
Ok(ca_roots) if c.mandatory_mtls => AllowAnyAuthenticatedClient::new(ca_roots), Ok(ca) if c.mandatory_mtls => AllowAnyAuthenticatedClient::new(ca).boxed(),
Ok(ca_roots) => AllowAnyAnonymousOrAuthenticatedClient::new(ca_roots), Ok(ca) => AllowAnyAnonymousOrAuthenticatedClient::new(ca).boxed(),
Err(e) => return Err(io::Error::new(e.kind(), format!("bad CA cert(s): {}", e))), Err(e) => return Err(io::Error::new(e.kind(), format!("bad CA cert(s): {}", e))),
}, },
None => NoClientAuth::new(), None => NoClientAuth::boxed(),
}; };
let mut tls_config = ServerConfig::builder() let mut tls_config = ServerConfig::builder()