magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

replace deprecated sha-1 crate, try to reduce some unnecessary crates/features

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-11-15 09:44:29 -05:00
parent dac1a01216
commit 3f69f2ee73
No known key found for this signature in database
3 changed files with 43 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

49
Cargo.lock generated
View file

@ -676,7 +676,7 @@ dependencies = [
"serde", "serde",
"serde_html_form", "serde_html_form",
"serde_json", "serde_json",
"sha-1", "sha1",
"tokio", "tokio",
"tracing", "tracing",
] ]
@ -720,7 +720,7 @@ dependencies = [
"serde_json", "serde_json",
"serde_regex", "serde_regex",
"serde_yaml", "serde_yaml",
"thiserror 1.0.69", "thiserror 2.0.3",
"tikv-jemalloc-ctl", "tikv-jemalloc-ctl",
"tikv-jemalloc-sys", "tikv-jemalloc-sys",
"tikv-jemallocator", "tikv-jemallocator",
@ -1753,9 +1753,9 @@ dependencies = [
[[package]] [[package]]
name = "hyper-util" name = "hyper-util"
version = "0.1.8" version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
dependencies = [ dependencies = [
"bytes", "bytes",
"futures-channel", "futures-channel",
@ -1766,7 +1766,6 @@ dependencies = [
"pin-project-lite", "pin-project-lite",
"socket2", "socket2",
"tokio", "tokio",
"tower 0.4.13",
"tower-service", "tower-service",
"tracing", "tracing",
] ]
@ -2080,11 +2079,9 @@ checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f"
dependencies = [ dependencies = [
"base64 0.21.7", "base64 0.21.7",
"js-sys", "js-sys",
"pem",
"ring", "ring",
"serde", "serde",
"serde_json", "serde_json",
"simple_asn1",
] ]
[[package]] [[package]]
@ -2662,16 +2659,6 @@ dependencies = [
"syn 2.0.87", "syn 2.0.87",
] ]
[[package]]
name = "pem"
version = "3.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae"
dependencies = [
"base64 0.22.1",
"serde",
]
[[package]] [[package]]
name = "percent-encoding" name = "percent-encoding"
version = "2.3.1" version = "2.3.1"
@ -3535,11 +3522,10 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
[[package]] [[package]]
name = "sanitize-filename" name = "sanitize-filename"
version = "0.5.0" version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2ed72fbaf78e6f2d41744923916966c4fbe3d7c74e3037a8ee482f1115572603" checksum = "bc984f4f9ceb736a7bb755c3e3bd17dc56370af2600c9780dcc48c66453da34d"
dependencies = [ dependencies = [
"lazy_static",
"regex", "regex",
] ]
@ -3827,17 +3813,6 @@ dependencies = [
"unsafe-libyaml", "unsafe-libyaml",
] ]
[[package]]
name = "sha-1"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c"
dependencies = [
"cfg-if",
"cpufeatures",
"digest",
]
[[package]] [[package]]
name = "sha1" name = "sha1"
version = "0.10.6" version = "0.10.6"
@ -3920,18 +3895,6 @@ version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
[[package]]
name = "simple_asn1"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085"
dependencies = [
"num-bigint",
"num-traits",
"thiserror 1.0.69",
"time",
]
[[package]] [[package]]
name = "siphasher" name = "siphasher"
version = "0.3.11" version = "0.3.11"

62
Cargo.toml
View file

@ -46,20 +46,20 @@ default-features = false
features = ["parse"] features = ["parse"]
[workspace.dependencies.sanitize-filename] [workspace.dependencies.sanitize-filename]
version = "0.5.0" version = "0.6.0"
[workspace.dependencies.jsonwebtoken] [workspace.dependencies.jsonwebtoken]
version = "9.3.0" version = "9.3.0"
default-features = false
[workspace.dependencies.base64] [workspace.dependencies.base64]
version = "0.22.1" version = "0.22.1"
default-features = false
# used for TURN server authentication # used for TURN server authentication
[workspace.dependencies.hmac] [workspace.dependencies.hmac]
version = "0.12.1" version = "0.12.1"
default-features = false
[workspace.dependencies.sha-1]
version = "0.10.1"
# used for checking if an IP is in specific subnets / CIDR ranges easier # used for checking if an IP is in specific subnets / CIDR ranges easier
[workspace.dependencies.ipaddress] [workspace.dependencies.ipaddress]
@ -70,16 +70,16 @@ version = "0.8.5"
# Used for the http request / response body type for Ruma endpoints used with reqwest # Used for the http request / response body type for Ruma endpoints used with reqwest
[workspace.dependencies.bytes] [workspace.dependencies.bytes]
version = "1.7.2" version = "1.8.0"
[workspace.dependencies.http-body-util] [workspace.dependencies.http-body-util]
version = "0.1.1" version = "0.1.2"
[workspace.dependencies.http] [workspace.dependencies.http]
version = "1.1.0" version = "1.1.0"
[workspace.dependencies.regex] [workspace.dependencies.regex]
version = "1.10.6" version = "1.11.1"
[workspace.dependencies.axum] [workspace.dependencies.axum]
version = "0.7.5" version = "0.7.5"
@ -95,7 +95,7 @@ features = [
] ]
[workspace.dependencies.axum-extra] [workspace.dependencies.axum-extra]
version = "0.9.3" version = "0.9.4"
default-features = false default-features = false
features = ["typed-header", "tracing"] features = ["typed-header", "tracing"]
@ -116,7 +116,7 @@ default-features = false
features = ["util"] features = ["util"]
[workspace.dependencies.tower-http] [workspace.dependencies.tower-http]
version = "0.6.0" version = "0.6.1"
default-features = false default-features = false
features = [ features = [
"add-extension", "add-extension",
@ -130,6 +130,8 @@ features = [
[workspace.dependencies.rustls] [workspace.dependencies.rustls]
version = "0.23.16" version = "0.23.16"
default-features = false
features = ["aws_lc_rs"]
[workspace.dependencies.reqwest] [workspace.dependencies.reqwest]
version = "0.12.9" version = "0.12.9"
@ -147,7 +149,7 @@ default-features = false
features = ["rc"] features = ["rc"]
[workspace.dependencies.serde_json] [workspace.dependencies.serde_json]
version = "1.0.124" version = "1.0.132"
default-features = false default-features = false
features = ["raw_value"] features = ["raw_value"]
@ -189,9 +191,11 @@ version = "0.1.40"
default-features = false default-features = false
[workspace.dependencies.tracing-subscriber] [workspace.dependencies.tracing-subscriber]
version = "0.3.18" version = "0.3.18"
features = ["env-filter"] default-features = false
features = ["env-filter", "std", "tracing", "tracing-log", "ansi", "fmt"]
[workspace.dependencies.tracing-core] [workspace.dependencies.tracing-core]
version = "0.1.32" version = "0.1.32"
default-features = false
# for URL previews # for URL previews
[workspace.dependencies.webpage] [workspace.dependencies.webpage]
@ -200,12 +204,14 @@ default-features = false
# used for conduit's CLI and admin room command parsing # used for conduit's CLI and admin room command parsing
[workspace.dependencies.clap] [workspace.dependencies.clap]
version = "4.5.20" version = "4.5.21"
default-features = false default-features = false
features = [ features = [
"std", "std",
"derive", "derive",
"help", "help",
#"color", Do we need these?
#"unicode",
"usage", "usage",
"error-context", "error-context",
"string", "string",
@ -217,7 +223,7 @@ default-features = false
features = ["std", "async-await"] features = ["std", "async-await"]
[workspace.dependencies.tokio] [workspace.dependencies.tokio]
version = "1.40.0" version = "1.41.1"
default-features = false default-features = false
features = [ features = [
"fs", "fs",
@ -238,7 +244,7 @@ version = "0.8.5"
# Validating urls in config, was already a transitive dependency # Validating urls in config, was already a transitive dependency
[workspace.dependencies.url] [workspace.dependencies.url]
version = "2.5.0" version = "2.5.3"
default-features = false default-features = false
features = ["serde"] features = ["serde"]
@ -258,26 +264,23 @@ features = [
] ]
[workspace.dependencies.hyper-util] [workspace.dependencies.hyper-util]
# 0.1.9 and above causes DNS issues version = "0.1.10"
version = "=0.1.8"
default-features = false default-features = false
features = [ features = [
"client",
"server-auto", "server-auto",
"server-graceful", "server-graceful",
"service",
"tokio", "tokio",
] ]
# to support multiple variations of setting a config option # to support multiple variations of setting a config option
[workspace.dependencies.either] [workspace.dependencies.either]
version = "1.11.0" version = "1.13.0"
default-features = false default-features = false
features = ["serde"] features = ["serde"]
# Used for reading the configuration from conduwuit.toml & environment variables # Used for reading the configuration from conduwuit.toml & environment variables
[workspace.dependencies.figment] [workspace.dependencies.figment]
version = "0.10.18" version = "0.10.19"
default-features = false default-features = false
features = ["env", "toml"] features = ["env", "toml"]
@ -287,11 +290,13 @@ default-features = false
# Used for conduit::Error type # Used for conduit::Error type
[workspace.dependencies.thiserror] [workspace.dependencies.thiserror]
version = "1.0.63" version = "2.0.3"
default-features = false
# Used when hashing the state # Used when hashing the state
[workspace.dependencies.ring] [workspace.dependencies.ring]
version = "0.17.8" version = "0.17.8"
default-features = false
# Used to make working with iterators easier, was already a transitive depdendency # Used to make working with iterators easier, was already a transitive depdendency
[workspace.dependencies.itertools] [workspace.dependencies.itertools]
@ -307,7 +312,7 @@ version = "2.1.1"
version = "0.4.0" version = "0.4.0"
[workspace.dependencies.async-trait] [workspace.dependencies.async-trait]
version = "0.1.81" version = "0.1.83"
[workspace.dependencies.lru-cache] [workspace.dependencies.lru-cache]
version = "0.1.2" version = "0.1.2"
@ -363,9 +368,13 @@ features = [
"bzip2", "bzip2",
] ]
# optional SHA256 media keys feature
[workspace.dependencies.sha2] [workspace.dependencies.sha2]
version = "0.10.8" version = "0.10.8"
default-features = false
[workspace.dependencies.sha1]
version = "0.10.6"
default-features = false
# optional opentelemetry, performance measurements, flamegraphs, etc for performance measurements and monitoring # optional opentelemetry, performance measurements, flamegraphs, etc for performance measurements and monitoring
[workspace.dependencies.opentelemetry] [workspace.dependencies.opentelemetry]
@ -433,7 +442,8 @@ default-features = false
features = ["resource"] features = ["resource"]
[workspace.dependencies.sd-notify] [workspace.dependencies.sd-notify]
version = "0.4.1" version = "0.4.3"
default-features = false
[workspace.dependencies.hardened_malloc-rs] [workspace.dependencies.hardened_malloc-rs]
version = "0.1.2" version = "0.1.2"
@ -456,12 +466,12 @@ default-features = false
version = "0.1" version = "0.1"
[workspace.dependencies.syn] [workspace.dependencies.syn]
version = "2.0.76" version = "2.0.87"
default-features = false default-features = false
features = ["full", "extra-traits"] features = ["full", "extra-traits"]
[workspace.dependencies.quote] [workspace.dependencies.quote]
version = "1.0.36" version = "1.0.37"
[workspace.dependencies.proc-macro2] [workspace.dependencies.proc-macro2]
version = "1.0.89" version = "1.0.89"

2
src/api/Cargo.toml
View file

@ -59,7 +59,7 @@ ruma.workspace = true
serde_html_form.workspace = true serde_html_form.workspace = true
serde_json.workspace = true serde_json.workspace = true
serde.workspace = true serde.workspace = true
sha-1.workspace = true sha1.workspace = true
tokio.workspace = true tokio.workspace = true
tracing.workspace = true tracing.workspace = true