Skip to content

chore(deps): rework dependencies #735

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
Benoît Cortier (CBenoit) merged 4 commits into from
Sep 1, 2026
Merged

chore(deps): rework dependencies #735

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
4aa73c9
chore(deps): rework dependencies;
PavloMyroniuk-apriorit Aug 25, 2026
458d153
chore: disable default features for uuid;
PavloMyroniuk-apriorit Aug 25, 2026
800d87d
chore: turn off default features;
PavloMyroniuk-apriorit Aug 25, 2026
01f6941
chore: turn on default features for `uuid`
TheBestTvarynka Sep 1, 2026
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
223 changes: 112 additions & 111 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

95 changes: 33 additions & 62 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,26 +77,6 @@ suspicious_xor_used_as_pow = "warn"
unused_result_ok = "warn"

[workspace.dependencies]
uuid = { version = "1.23", default-features = false }
tracing = { version = "0.1", default-features = false }
bitflags = "2.11"
rand = "0.10"
rand_core = "0.10"
getrandom = "0.3"
cfg-if = "1"
time = { version = "0.3", default-features = false }
sha1 = { version = "0.11", default-features = false }
sha2 = "0.11"
num-derive = "0.5"
num-traits = { version = "0.2", default-features = false }

picky = { version = "=7.0.0-rc.26", default-features = false }
picky-asn1 = "0.10"
picky-asn1-der = "0.5"
picky-asn1-x509 = "0.15"
picky-krb = "0.12"

tokio = "1.52"
ffi-types = { path = "crates/ffi-types" }
winscard = { version = "0.3", path = "crates/winscard" }

Expand All @@ -106,15 +86,6 @@ dpapi-pdu = { version = "0.1.0", path = "crates/dpapi-pdu" }
dpapi-transport = { version = "0.1.0", path = "crates/dpapi-transport" }
dpapi-native-transport = { version = "0.1.0", path = "crates/dpapi-native-transport" }

rsa = { version = "=0.10.0-rc.18", default-features = false }
base64 = "0.23"
whoami = "2.1"
tracing-subscriber = "0.3"
proptest = "1.6"
serde = "1"
byteorder = "1.5"
crypto-bigint = { version = "0.7", default-features = false, features = ["alloc"] }
hmac = "0.13"

[features]
default = ["aws-lc-rs"]
Expand All @@ -139,30 +110,30 @@ __rustls-used = ["dep:rustls"]
__install-crypto-provider = []

[dependencies]
bitflags.workspace = true
rand.workspace = true
rand_core.workspace = true
getrandom.workspace = true
cfg-if.workspace = true
picky.workspace = true
sha1.workspace = true
sha2.workspace = true
num-derive.workspace = true
num-traits = { workspace = true, default-features = true }
picky-asn1-der.workspace = true
picky-asn1-x509 = { workspace = true, features = ["pkcs7"] }
uuid = { workspace = true, features = ["v4"], default-features = true }
bitflags = "2.11"
rand = "0.10"
rand_core = "0.10"
getrandom = "0.3"
cfg-if = "1"
picky = { version = "=7.0.0-rc.26", default-features = false }
sha1 = { version = "0.11", default-features = false }
sha2 = "0.11"
num-derive = "0.5"
num-traits = { version = "0.2", default-features = true }
picky-asn1-der = "0.5"
picky-asn1-x509 = { version = "0.15", features = ["pkcs7"] }
uuid = { version = "1.23", default-features = true, features = ["v4"] }
# `rt-multi-thread` feature is required for `tokio::task::block_in_place` function.
tokio = { workspace = true, optional = true, features = ["time", "rt", "rt-multi-thread"] }
tokio = { version = "1.52", optional = true, features = ["time", "rt", "rt-multi-thread"] }
winscard = { workspace = true, optional = true }
rsa = { workspace = true }
tracing = { workspace = true, default-features = true }
serde.workspace = true
picky-krb.workspace = true
picky-asn1 = { workspace = true, features = ["time_conversion"] }
byteorder.workspace = true
crypto-bigint.workspace = true
hmac.workspace = true
rsa = { version = "=0.10.0-rc.18", default-features = false }
tracing = { version = "0.1", default-features = true }
serde = "1"
picky-krb = "0.12"
picky-asn1 = { version = "0.10", features = ["time_conversion"] }
byteorder = "1.5"
crypto-bigint = { version = "0.7", default-features = false, features = ["alloc"] }
hmac = "0.13"
widestring = "1.2"

url = "2.5"
Expand All @@ -187,32 +158,32 @@ windows-registry = "0.6"
windows = { version = "0.62", features = [ "Win32_Foundation", "Win32_System", "Win32_NetworkManagement_Dns", "Win32_Security_Cryptography"] }

[target.'cfg(target_arch = "wasm32")'.dependencies]
uuid = { workspace = true, features = ["js"]}
getrandom = { workspace = true, features = ["wasm_js"] }
time = { workspace = true, features = ["wasm-bindgen"] }
uuid = { version = "1.23", default-features = false, features = ["js"]}
getrandom = { version = "0.3", features = ["wasm_js"] }
time = { version = "0.3", default-features = false, features = ["wasm-bindgen"] }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
cryptoki = { version = "0.12", optional = true }
time = { workspace = true, features = ["std"] }
time = { version = "0.3", features = ["std"] }

[target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies]
async-dnssd = "0.5"
futures = "0.3"
tokio = { workspace = true, features = ["time", "rt", "rt-multi-thread"] }
tokio = { version = "1.52", features = ["time", "rt", "rt-multi-thread"] }

# Pin transitive dependencies
# TODO: Remove when stable versions will be released
# RustCrypto crates
pkcs1 = "=0.8.0-rc.4"

[dev-dependencies]
base64.workspace = true
base64 = "0.23"
static_assertions = "1"
whoami.workspace = true
picky = { workspace = true, features = ["x509"] }
tracing-subscriber = { workspace = true, features = ["env-filter"] }
proptest.workspace = true
cfg-if.workspace = true
whoami = "2.1"
picky = { version = "=7.0.0-rc.26", default-features = false, features = ["x509"] }
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
proptest = "1.6"
cfg-if = "1"

[lints]
workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/dpapi-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ std = []
alloc = []

[dependencies]
uuid.workspace = true
uuid = { version = "1.23", default-features = false }
ironrdp-core = { version = "0.1", features = ["alloc"] }

[lints]
Expand Down
8 changes: 4 additions & 4 deletions crates/dpapi-native-transport/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ publish = false # not ready yet

[dependencies]
transport = { git = "https://github.com/Devolutions/devolutions-gateway.git", rev = "4fd9c22" }
tokio.workspace = true
tokio = "1.52"
tokio-tungstenite = { version = "0.30", default-features = false, features = ["connect", "rustls-tls-native-roots"] }
url = "2.5"
uuid = { workspace = true, features = ["v4"] }
tracing.workspace = true
dpapi-transport.workspace = true
uuid = { version = "1.23", default-features = false, features = ["v4"] }
tracing = { version = "0.1", default-features = false }
dpapi-transport = { path = "../dpapi-transport", version = "0.1.0" }
futures-util = "0.3"

[lints]
Expand Down
10 changes: 5 additions & 5 deletions crates/dpapi-pdu/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ arbitrary = ["uuid/arbitrary", "bitflags/arbitrary", "dep:arbitrary", "std"]

[dependencies]
dpapi-core = { workspace = true, features = ["alloc"] }
uuid.workspace = true
crypto-bigint.workspace = true
bitflags.workspace = true
num-derive.workspace = true
num-traits = { workspace = true, default-features = true }
uuid = { version = "1.23", default-features = false }
crypto-bigint = { version = "0.7", default-features = false, features = ["alloc"] }
bitflags = "2.11"
num-derive = "0.5"
num-traits = { version = "0.2", default-features = true }

thiserror = { version = "2.0", default-features = false }
arbitrary = { version = "1", optional = true, features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion crates/dpapi-transport/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ publish = false # not ready yet
[dependencies]
url = "2.5"
thiserror = "2.0"
uuid.workspace = true
uuid = { version = "1.23", default-features = false }

[lints]
workspace = true
6 changes: 3 additions & 3 deletions crates/dpapi-web/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ tracing-web = "0.1"
futures-util = { version = "0.3", features = ["io"] }

# Logging
tracing.workspace = true
tracing = { version = "0.1", default-features = false }
tracing-subscriber = { version = "0.3", features = ["time"] }

# The `console_error_panic_hook` crate provides better debugging of panics by
Expand All @@ -54,13 +54,13 @@ rustls-pki-types = { version = "1.14", features = ["web"] }
anyhow = "1"
url = "2.5"

uuid = { workspace = true, default-features = false }
uuid = { version = "1.23", default-features = false }

# Enable WebAssembly support for a few crates
[target.'cfg(target_arch = "wasm32")'.dependencies]
getrandom02 = { package = "getrandom", version = "0.2", default-features = false, features = ["js"] }
getrandom03 = { package = "getrandom", version = "0.3", default-features = false, features = ["wasm_js"] }
time = { workspace = true, features = ["wasm-bindgen"] }
time = { version = "0.3", default-features = false, features = ["wasm-bindgen"] }

[lints]
workspace = true
32 changes: 16 additions & 16 deletions crates/dpapi/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,23 @@ name = "dpapi"
tsssp = ["sspi/tsssp"]

[dependencies]
bitflags.workspace = true
byteorder.workspace = true
num-derive.workspace = true
num-traits = { workspace = true, default-features = true }
uuid = { workspace = true, features = ["std"] }
picky-asn1.workspace = true
picky-asn1-der.workspace = true
picky-krb.workspace = true
picky-asn1-x509 = { workspace = true, features = ["pkcs7"] }
sha1.workspace = true
sha2.workspace = true
rand.workspace = true
rand_core.workspace = true
hmac.workspace = true
bitflags = "2.11"
byteorder = "1.5"
num-derive = "0.5"
num-traits = { version = "0.2", default-features = true }
uuid = { version = "1.23", default-features = false, features = ["std"] }
picky-asn1 = "0.10"
picky-asn1-der = "0.5"
picky-krb = "0.12"
picky-asn1-x509 = { version = "0.15", features = ["pkcs7"] }
sha1 = { version = "0.11", default-features = false }
sha2 = "0.11"
rand = "0.10"
rand_core = "0.10"
hmac = "0.13"
digest = "0.11"
tracing = { workspace = true, default-features = true }
whoami.workspace = true
tracing = { version = "0.1", default-features = true }
whoami = "2.1"

dpapi-core = { workspace = true, features = ["alloc"] }
dpapi-pdu.workspace = true
Expand Down
12 changes: 6 additions & 6 deletions crates/kdc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ authors = ["Devolutions Inc. <infos@devolutions.net>"]
description = "A minimal Rust implementation of the KDC (Key Distribution Center)"

[dependencies]
picky-asn1 = { workspace = true, features = ["time_conversion"] }
picky-asn1-der.workspace = true
picky-asn1-x509.workspace = true
picky-krb.workspace = true
tracing.workspace = true
time.workspace = true
picky-asn1 = { version = "0.10", features = ["time_conversion"] }
picky-asn1-der = "0.5"
picky-asn1-x509 = "0.15"
picky-krb = "0.12"
tracing = { version = "0.1", default-features = false }
time = { version = "0.3", default-features = false }

thiserror = "2.0"
argon2 = { version = "0.5", features = ["std"] }
Expand Down
30 changes: 15 additions & 15 deletions crates/winscard/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,24 @@ std = ["tracing/std", "base64", "picky-asn1-der"]
name = "winscard"

[dependencies]
bitflags.workspace = true
bitflags = "2.11"
iso7816 = "0.1"
iso7816-tlv = "0.4"
picky = { workspace = true, features = ["x509"] }
picky-asn1-x509.workspace = true
tracing = { workspace = true, features = ["attributes"] }
time = { workspace = true, features = [
picky = { version = "=7.0.0-rc.26", default-features = false, features = ["x509"] }
picky-asn1-x509 = "0.15"
tracing = { version = "0.1", default-features = false, features = ["attributes"] }
time = { version = "0.3", default-features = false, features = [
"formatting",
] }
uuid = { workspace = true, features = ["v4"] }
uuid = { version = "1.23", default-features = false, features = ["v4"] }
flate2 = { version = "1.1", default-features = false }
rsa = { workspace = true, features = ["hazmat"] }
sha1.workspace = true
base64 = { workspace = true , optional = true }
picky-asn1-der = { workspace = true, optional = true }
num-derive.workspace = true
num-traits.workspace = true
crypto-bigint.workspace = true
rsa = { version = "=0.10.0-rc.18", default-features = false, features = ["hazmat"] }
sha1 = { version = "0.11", default-features = false }
base64 = { version = "0.23", optional = true }
picky-asn1-der = { version = "0.5", optional = true }
num-derive = "0.5"
num-traits = { version = "0.2", default-features = false }
crypto-bigint = { version = "0.7", default-features = false, features = ["alloc"] }
widestring = "1.2"

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
Expand All @@ -44,8 +44,8 @@ flate2 = { version = "1.1", default-features = false, features = ["zlib"] }
flate2 = { version = "1.1", default-features = false, features = ["rust_backend"] }

[dev-dependencies]
proptest.workspace = true
rand.workspace = true
proptest = "1.6"
rand = "0.10"

[lints]
workspace = true
28 changes: 14 additions & 14 deletions ffi/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,28 +21,28 @@ ring = ["sspi/ring"]
dpapi = ["dep:dpapi", "dep:dpapi-transport", "dep:dpapi-native-transport", "dep:tokio", "dep:url", "dep:ffi-types"]

[dependencies]
cfg-if.workspace = true
num-traits = { workspace = true, default-features = true }
whoami.workspace = true
sha1.workspace = true
sha2.workspace = true
cfg-if = "1"
num-traits = { version = "0.2", default-features = true }
whoami = "2.1"
sha1 = { version = "0.11", default-features = false }
sha2 = "0.11"
ffi-types = { workspace = true, features = ["winscard"], optional = true }

picky = { workspace = true, features = ["x509"], optional = true }
picky-asn1-der.workspace = true
picky-asn1 = { workspace = true, optional = true }
picky-asn1-x509 = { workspace = true, optional = true }
picky = { version = "=7.0.0-rc.26", default-features = false, features = ["x509"], optional = true }
picky-asn1-der = "0.5"
picky-asn1 = { version = "0.10", optional = true }
picky-asn1-x509 = { version = "0.15", optional = true }

uuid.workspace = true
uuid = { version = "1.23", default-features = false }
winscard = { workspace = true, features = ["std"], optional = true }
dpapi = { workspace = true, optional = true }
dpapi-transport = { workspace = true, optional = true }
dpapi-native-transport = { workspace = true, optional = true }
url = { version = "2.5", optional = true }
tokio = { workspace = true, optional = true, features = ["rt"]}
tokio = { version = "1.52", optional = true, features = ["rt"]}
# logging
tracing = { workspace = true, default-features = true }
tracing-subscriber = { workspace = true, features = ["std", "fmt", "local-time", "env-filter"] }
tracing = { version = "0.1", default-features = true }
tracing-subscriber = { version = "0.3", features = ["std", "fmt", "local-time", "env-filter"] }

libc = "0.2"
sspi = { path = "..", default-features = false, features = ["network_client"] }
Expand All @@ -57,7 +57,7 @@ windows = { version = "0.62", features = ["Win32_Security_Cryptography", "Win32_
embed-resource = "3"

[target.'cfg(not(windows))'.dependencies]
bitflags = { workspace = true, optional = true }
bitflags = { version = "2.11", optional = true }

[target.'cfg(not(any(target_os="macos", target_os="ios", windows)))'.dependencies]
sspi = { path = "..", default-features = false, features = ["dns_resolver"] }
Expand Down
7 changes: 5 additions & 2 deletions src/credssp/ts_request/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@ fn buffer_len_correct_returns_len() {
let buffer = NTLM_3_PHASE_TS_REQUEST;
let ts_request = TsRequest::from_buffer(buffer.as_ref()).unwrap();

assert_eq!(buffer.len(), ts_request.buffer_len().unwrap().into());
assert_eq!(buffer.len(), usize::from(ts_request.buffer_len().unwrap()));
}

#[test]
Expand All @@ -611,5 +611,8 @@ fn buffer_len_correct_returns_len_with_garbage() {

let ts_request = TsRequest::from_buffer(buffer.as_ref()).unwrap();

assert_eq!((buffer.len() - garbage_len), ts_request.buffer_len().unwrap().into());
assert_eq!(
buffer.len() - garbage_len,
usize::from(ts_request.buffer_len().unwrap())
);
}
Loading