Skip to content

make the subdependency on on aws-lc-rs optional #25

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

Merged
merged 4 commits into from
Jun 1, 2025
Merged

make the subdependency on on aws-lc-rs optional #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7f73262
remove default features from rustls dependency
lovasoa Jun 1, 2025
8a053ba
remove default features from tokio-rustls dependency
lovasoa Jun 1, 2025
d98e46e
The subdependency on aws-lc-rs (dependency of rustls) is no optional
lovasoa Jun 1, 2025
1b6d2b3
activate tls1.2 in sqlx macros
lovasoa Jun 1, 2025
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## 0.6.43
- Fix decoding of small negative unsigned integer in Mssql.
- The subdependency on aws-lc-rs (dependency of rustls) is no optional. You can use your own crypto provider (such as ring or openssl) by using the new crate feature `runtime-tokio-rustls-nocrypto` instead of `runtime-tokio-rustls`.

## 0.6.42
- Fix `QueryBuilder` for Microsoft SQL Server: https://github.com/sqlpage/sqlx-oldapi/issues/11
Expand Down
17 changes: 17 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,32 @@ runtime-tokio-native-tls = [

runtime-actix-rustls = ["runtime-tokio-rustls"]
runtime-async-std-rustls = [
"sqlx-core/runtime-async-std-rustls",
"sqlx-macros/runtime-async-std-rustls",
"aws_lc_rs",
"tls12",
"_rt-async-std",
]
runtime-async-std-rustls-nocrypto = [
"sqlx-core/runtime-async-std-rustls",
"sqlx-macros/runtime-async-std-rustls",
"_rt-async-std",
]
runtime-tokio-rustls = [
"sqlx-core/runtime-tokio-rustls",
"sqlx-macros/runtime-tokio-rustls",
"aws_lc_rs",
"tls12",
"_rt-tokio",
]
runtime-tokio-rustls-nocrypto = [
"sqlx-core/runtime-tokio-rustls",
"sqlx-macros/runtime-tokio-rustls",
"_rt-tokio",
]

aws_lc_rs = ["sqlx-core/aws_lc_rs"]
tls12 = ["sqlx-core/tls12"]

# for conditional compilation
_rt-async-std = []
Expand Down
4 changes: 3 additions & 1 deletion sqlx-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ _rt-async-std = []
_rt-tokio = ["tokio-stream", "tokio-util"]
_tls-native-tls = []
_tls-rustls = ["rustls", "rustls-pemfile", "webpki-roots"]
aws_lc_rs = ["rustls/aws_lc_rs", "sqlx-rt/aws_lc_rs"]
tls12 = ["rustls/tls12"]

# support offline/decoupled building (enables serialization of `Describe`)
offline = ["serde", "either/serde"]
Expand Down Expand Up @@ -144,7 +146,7 @@ percent-encoding = "2.1.0"
rand = { version = "0.8", default-features = false, optional = true, features = ["std", "std_rng"] }
regex = { version = "1.5.5", optional = true }
rsa = { version = "0.9.2", optional = true }
rustls = { version = "0.23", optional = true }
rustls = { version = "0.23", optional = true, default-features = false }
rustls-pemfile = { version = "2.1", optional = true }
serde = { version = "1.0.132", features = ["derive", "rc"], optional = true }
serde_json = { version = "1.0.73", features = ["raw_value"], optional = true }
Expand Down
4 changes: 2 additions & 2 deletions sqlx-macros/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ heck = { version = "0.5" }
either = "1.6.1"
once_cell = "1.9.0"
proc-macro2 = { version = "1.0.36", default-features = false }
sqlx-core = { package = "sqlx-core-oldapi", version = "0.6.43", default-features = false, features = ["any"], path = "../sqlx-core" }
sqlx-rt = { version = "0.6.43", default-features = false, path = "../sqlx-rt", package = "sqlx-rt-oldapi" }
sqlx-core = { package = "sqlx-core-oldapi", version = "0.6.43", default-features = false, features = ["any", "aws_lc_rs", "tls12"], path = "../sqlx-core" }
sqlx-rt = { version = "0.6.43", default-features = false, path = "../sqlx-rt", package = "sqlx-rt-oldapi", features = ["aws_lc_rs"] }
serde = { version = "1.0.132", features = ["derive"], optional = true }
serde_json = { version = "1.0.73", optional = true }
sha2 = { version = "0.10.0", optional = true }
Expand Down
3 changes: 2 additions & 1 deletion sqlx-rt/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ runtime-tokio-native-tls = ["_rt-tokio", "_tls-native-tls", "tokio-native-tls"]
runtime-actix-rustls = ["runtime-tokio-rustls"]
runtime-async-std-rustls = ["_rt-async-std", "_tls-rustls", "futures-rustls"]
runtime-tokio-rustls = ["_rt-tokio", "_tls-rustls", "tokio-rustls"]
aws_lc_rs = ["tokio-rustls/aws_lc_rs"]

# Not used directly and not re-exported from sqlx
_rt-async-std = ["async-std"]
Expand All @@ -34,7 +35,7 @@ async-native-tls = { version = "0.5.0", optional = true }
futures-rustls = { version = "0.26", optional = true }
async-std = { version = "1.7.0", features = ["unstable"], optional = true }
tokio-native-tls = { version = "0.3.0", optional = true }
tokio-rustls = { version = "0.26", optional = true }
tokio-rustls = { version = "0.26", optional = true, default-features = false }
native-tls = { version = "0.2.4", optional = true }
once_cell = { version = "1.4", features = ["std"], optional = true }

Expand Down
Loading