forked from lavina/lavina
1
0
Fork 0

disable tls support in sqlx, remove webpki-roots

This commit is contained in:
Nikita Vilunov 2023-09-14 18:55:03 +02:00
parent 53f218c58f
commit c662b64f11
3 changed files with 7 additions and 29 deletions

26
Cargo.lock generated
View File

@ -1603,19 +1603,14 @@ dependencies = [
"once_cell", "once_cell",
"paste", "paste",
"percent-encoding", "percent-encoding",
"rustls",
"rustls-pemfile",
"serde", "serde",
"serde_json", "serde_json",
"sha2", "sha2",
"smallvec", "smallvec",
"sqlformat", "sqlformat",
"thiserror", "thiserror",
"tokio",
"tokio-stream",
"tracing", "tracing",
"url", "url",
"webpki-roots",
] ]
[[package]] [[package]]
@ -1652,7 +1647,6 @@ dependencies = [
"sqlx-sqlite", "sqlx-sqlite",
"syn 1.0.109", "syn 1.0.109",
"tempfile", "tempfile",
"tokio",
"url", "url",
] ]
@ -1895,17 +1889,6 @@ dependencies = [
"tokio", "tokio",
] ]
[[package]]
name = "tokio-stream"
version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
dependencies = [
"futures-core",
"pin-project-lite",
"tokio",
]
[[package]] [[package]]
name = "tokio-util" name = "tokio-util"
version = "0.7.8" version = "0.7.8"
@ -2208,15 +2191,6 @@ dependencies = [
"wasm-bindgen", "wasm-bindgen",
] ]
[[package]]
name = "webpki-roots"
version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888"
dependencies = [
"rustls-webpki",
]
[[package]] [[package]]
name = "whoami" name = "whoami"
version = "1.4.1" version = "1.4.1"

View File

@ -24,7 +24,7 @@ rustls-pemfile = "1.0.2"
quick-xml = { version = "0.30.0", features = ["async-tokio"] } quick-xml = { version = "0.30.0", features = ["async-tokio"] }
derive_more = "0.99.17" derive_more = "0.99.17"
uuid = { version = "1.3.0", features = ["v4"] } uuid = { version = "1.3.0", features = ["v4"] }
sqlx = { version = "0.7.0-alpha.2", features = ["sqlite", "runtime-tokio-rustls", "migrate"] } sqlx = { version = "0.7.0-alpha.2", features = ["sqlite", "migrate"] }
[dev-dependencies] [dev-dependencies]
assert_matches = "1.5.0" assert_matches = "1.5.0"

View File

@ -17,14 +17,18 @@ allow = [
"MIT", "MIT",
"Apache-2.0", "Apache-2.0",
"ISC", "ISC",
"MPL-2.0",
"BSD-3-Clause", "BSD-3-Clause",
] ]
exceptions = [ exceptions = [
{ allow = ["Unicode-DFS-2016"], name = "unicode-ident" }, { allow = ["Unicode-DFS-2016"], name = "unicode-ident" },
{ allow = ["OpenSSL"], name = "ring" }, { allow = ["OpenSSL"], name = "ring" },
] ]
deny = ["GPL-2.0", "GPL-3.0", "AGPL-3.0"] deny = [
"GPL-2.0",
"GPL-3.0",
"AGPL-3.0",
"MPL-2.0" # it is used by webpki-roots; we do not hardcode root certs in the binary
]
copyleft = "deny" copyleft = "deny"
confidence-threshold = 0.93 confidence-threshold = 0.93
private = { ignore = true } private = { ignore = true }