Skip to content

Commit 2012e8e

Browse files
committed
feat(mssql): add tls-native-tls feature wiring to tiberius
Forward sqlx's tls-native-tls feature through sqlx-mssql (and sqlx-macros-core for compile-time query checking) to tiberius's native-tls feature, so sslmode=required actually negotiates TLS. No rustls wiring for now: tiberius's native-tls and rustls features are mutually exclusive (prisma/tiberius#317) and enabling both would break --all-features builds.
1 parent d91972c commit 2012e8e

4 files changed

Lines changed: 21 additions & 2 deletions

File tree

Cargo.lock

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ runtime-smol = ["_rt-smol", "sqlx-core/_rt-smol", "sqlx-macros?/_rt-smol"]
102102
runtime-tokio = ["_rt-tokio", "sqlx-core/_rt-tokio", "sqlx-macros?/_rt-tokio"]
103103

104104
# TLS features
105-
tls-native-tls = ["sqlx-core/_tls-native-tls", "sqlx-macros?/_tls-native-tls"]
105+
tls-native-tls = ["sqlx-core/_tls-native-tls", "sqlx-macros?/_tls-native-tls", "sqlx-mssql?/tls-native-tls"]
106106
tls-rustls = ["tls-rustls-ring"] # For backwards compatibility
107107
tls-rustls-aws-lc-rs = ["sqlx-core/_tls-rustls-aws-lc-rs", "sqlx-macros?/_tls-rustls-aws-lc-rs"]
108108
tls-rustls-ring = ["tls-rustls-ring-webpki"] # For backwards compatibility

sqlx-macros-core/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ _rt-async-std = ["async-std", "sqlx-core/_rt-async-std"]
1717
_rt-smol = ["smol", "sqlx-core/_rt-smol"]
1818
_rt-tokio = ["tokio", "sqlx-core/_rt-tokio"]
1919

20-
_tls-native-tls = ["sqlx-core/_tls-native-tls"]
20+
_tls-native-tls = ["sqlx-core/_tls-native-tls", "sqlx-mssql?/tls-native-tls"]
2121
_tls-rustls-aws-lc-rs = ["sqlx-core/_tls-rustls-aws-lc-rs"]
2222
_tls-rustls-ring-webpki = ["sqlx-core/_tls-rustls-ring-webpki"]
2323
_tls-rustls-ring-native-roots = ["sqlx-core/_tls-rustls-ring-native-roots"]

sqlx-mssql/Cargo.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@ migrate = ["sqlx-core/migrate"]
1919
winauth = ["tiberius/winauth"]
2020
integrated-auth-gssapi = ["tiberius/integrated-auth-gssapi"]
2121

22+
# TLS features
23+
# NOTE: no rustls support for now: tiberius' `native-tls` and `rustls` features are
24+
# mutually exclusive (https://github.com/prisma/tiberius/issues/317), and enabling both
25+
# would break `--all-features` builds.
26+
tls-native-tls = ["tiberius/native-tls"]
27+
2228
# Type Integration features
2329
bigdecimal = ["dep:bigdecimal", "sqlx-core/bigdecimal", "tiberius/bigdecimal"]
2430
chrono = ["dep:chrono", "sqlx-core/chrono", "tiberius/chrono"]

0 commit comments

Comments
 (0)