Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(deps): bump rustls from 0.21.12 to 0.23.9 #2084

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

chore(deps): bump rustls from 0.21.12 to 0.23.9 #2084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a50856
chore(deps): bump rustls from 0.21.12 to 0.23.9
dependabot[bot] Jun 10, 2024
07f53a7
fix as much as we can
ellie Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
193 changes: 186 additions & 7 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion crates/atuin-server/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,10 @@ fs-err = { workspace = true }
tower = { workspace = true }
tower-http = { version = "0.5.1", features = ["trace"] }
reqwest = { workspace = true }
rustls = "0.21"
rustls = "0.23"
rustls-pemfile = "2.1"
argon2 = "0.5"
semver = { workspace = true }
metrics-exporter-prometheus = "0.12.1"
metrics = "0.21.1"
rustls-pki-types = "1.7.0"
4 changes: 1 addition & 3 deletions crates/atuin-server/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ mod metrics;
mod router;
mod utils;

use rustls::ServerConfig;
pub use settings::example_config;
pub use settings::Settings;

Expand Down Expand Up @@ -86,8 +85,7 @@ async fn launch_with_tls<Db: Database>(
let certificates = settings.tls.certificates()?;
let pkey = settings.tls.private_key()?;

let server_config = ServerConfig::builder()
.with_safe_defaults()
let server_config = rustls::server::ServerConfig::builder()
.with_no_client_auth()
.with_single_cert(certificates, pkey)?;

Expand Down
Loading
Loading