Skip to content

update rustls dependency and make edits to support its api changes #3225

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

Closed
wants to merge 2 commits into from
Closed

update rustls dependency and make edits to support its api changes #3225

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
1b87b6d
update rustls dependency and make edits to support its api changes
May 7, 2024
076d5fa
Remove unnecessary addition of ring feature in rustls dep of sqlx-core
May 7, 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
51 changes: 24 additions & 27 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.

6 changes: 3 additions & 3 deletions sqlx-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ tokio = { workspace = true, optional = true }
# TLS
native-tls = { version = "0.2.10", optional = true }

rustls = { version = "0.21.11", default-features = false, features = ["dangerous_configuration", "tls12"], optional = true }
rustls-pemfile = { version = "1.0", optional = true }
webpki-roots = { version = "0.25", optional = true }
rustls = { version = "0.23.5", default-features = false, features = ["std", "tls12"], optional = true}
rustls-pemfile = { version = "2.1.2", optional = true }
webpki-roots = { version = "0.26.1", optional = true }

# Type Integrations
bit-vec = { workspace = true, optional = true }
Expand Down
8 changes: 8 additions & 0 deletions sqlx-core/src/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ use std::error::Error as StdError;
use std::fmt::Display;
use std::io;

// use rustls::server::VerifierBuilderError;
#[cfg(feature = "_tls-rustls")]
use rustls::server::VerifierBuilderError;

use crate::database::Database;

use crate::type_info::TypeInfo;
Expand Down Expand Up @@ -107,6 +111,10 @@ pub enum Error {
#[cfg(feature = "migrate")]
#[error("{0}")]
Migrate(#[source] Box<crate::migrate::MigrateError>),

#[cfg(feature = "_tls-rustls")]
#[error("Error building server verifier: {0}")]
VerifierBuilder(#[from] VerifierBuilderError)
}

impl StdError for Box<dyn DatabaseError> {}
Expand Down
Loading