Skip to content

Commit 2b6edf1

Browse files
TheBestTvarynkaPavloMyroniuk-apriorit
TheBestTvarynka
and
PavloMyroniuk-apriorit
authored
chore(deps): rework dependencies (#735)
Co-authored-by: Pavlo Myroniuk <pavlo.myroniuk@apriorit.com>
1 parent 03ee8d0 commit 2b6edf1

14 files changed

Lines changed: 217 additions & 242 deletions

File tree

‎Cargo.lock‎

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

‎Cargo.toml‎

Lines changed: 33 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -77,26 +77,6 @@ suspicious_xor_used_as_pow = "warn"
7777
unused_result_ok = "warn"
7878

7979
[workspace.dependencies]
80-
uuid = { version = "1.23", default-features = false }
81-
tracing = { version = "0.1", default-features = false }
82-
bitflags = "2.11"
83-
rand = "0.10"
84-
rand_core = "0.10"
85-
getrandom = "0.3"
86-
cfg-if = "1"
87-
time = { version = "0.3", default-features = false }
88-
sha1 = { version = "0.11", default-features = false }
89-
sha2 = "0.11"
90-
num-derive = "0.5"
91-
num-traits = { version = "0.2", default-features = false }
92-
93-
picky = { version = "=7.0.0-rc.26", default-features = false }
94-
picky-asn1 = "0.10"
95-
picky-asn1-der = "0.5"
96-
picky-asn1-x509 = "0.15"
97-
picky-krb = "0.12"
98-
99-
tokio = "1.52"
10080
ffi-types = { path = "crates/ffi-types" }
10181
winscard = { version = "0.3", path = "crates/winscard" }
10282

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

109-
rsa = { version = "=0.10.0-rc.18", default-features = false }
110-
base64 = "0.23"
111-
whoami = "2.1"
112-
tracing-subscriber = "0.3"
113-
proptest = "1.6"
114-
serde = "1"
115-
byteorder = "1.5"
116-
crypto-bigint = { version = "0.7", default-features = false, features = ["alloc"] }
117-
hmac = "0.13"
11889

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

141112
[dependencies]
142-
bitflags.workspace = true
143-
rand.workspace = true
144-
rand_core.workspace = true
145-
getrandom.workspace = true
146-
cfg-if.workspace = true
147-
picky.workspace = true
148-
sha1.workspace = true
149-
sha2.workspace = true
150-
num-derive.workspace = true
151-
num-traits = { workspace = true, default-features = true }
152-
picky-asn1-der.workspace = true
153-
picky-asn1-x509 = { workspace = true, features = ["pkcs7"] }
154-
uuid = { workspace = true, features = ["v4"], default-features = true }
113+
bitflags = "2.11"
114+
rand = "0.10"
115+
rand_core = "0.10"
116+
getrandom = "0.3"
117+
cfg-if = "1"
118+
picky = { version = "=7.0.0-rc.26", default-features = false }
119+
sha1 = { version = "0.11", default-features = false }
120+
sha2 = "0.11"
121+
num-derive = "0.5"
122+
num-traits = { version = "0.2", default-features = true }
123+
picky-asn1-der = "0.5"
124+
picky-asn1-x509 = { version = "0.15", features = ["pkcs7"] }
125+
uuid = { version = "1.23", default-features = true, features = ["v4"] }
155126
# `rt-multi-thread` feature is required for `tokio::task::block_in_place` function.
156-
tokio = { workspace = true, optional = true, features = ["time", "rt", "rt-multi-thread"] }
127+
tokio = { version = "1.52", optional = true, features = ["time", "rt", "rt-multi-thread"] }
157128
winscard = { workspace = true, optional = true }
158-
rsa = { workspace = true }
159-
tracing = { workspace = true, default-features = true }
160-
serde.workspace = true
161-
picky-krb.workspace = true
162-
picky-asn1 = { workspace = true, features = ["time_conversion"] }
163-
byteorder.workspace = true
164-
crypto-bigint.workspace = true
165-
hmac.workspace = true
129+
rsa = { version = "=0.10.0-rc.18", default-features = false }
130+
tracing = { version = "0.1", default-features = true }
131+
serde = "1"
132+
picky-krb = "0.12"
133+
picky-asn1 = { version = "0.10", features = ["time_conversion"] }
134+
byteorder = "1.5"
135+
crypto-bigint = { version = "0.7", default-features = false, features = ["alloc"] }
136+
hmac = "0.13"
166137
widestring = "1.2"
167138

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

189160
[target.'cfg(target_arch = "wasm32")'.dependencies]
190-
uuid = { workspace = true, features = ["js"]}
191-
getrandom = { workspace = true, features = ["wasm_js"] }
192-
time = { workspace = true, features = ["wasm-bindgen"] }
161+
uuid = { version = "1.23", default-features = false, features = ["js"]}
162+
getrandom = { version = "0.3", features = ["wasm_js"] }
163+
time = { version = "0.3", default-features = false, features = ["wasm-bindgen"] }
193164

194165
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
195166
cryptoki = { version = "0.12", optional = true }
196-
time = { workspace = true, features = ["std"] }
167+
time = { version = "0.3", features = ["std"] }
197168

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

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

208179
[dev-dependencies]
209-
base64.workspace = true
180+
base64 = "0.23"
210181
static_assertions = "1"
211-
whoami.workspace = true
212-
picky = { workspace = true, features = ["x509"] }
213-
tracing-subscriber = { workspace = true, features = ["env-filter"] }
214-
proptest.workspace = true
215-
cfg-if.workspace = true
182+
whoami = "2.1"
183+
picky = { version = "=7.0.0-rc.26", default-features = false, features = ["x509"] }
184+
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
185+
proptest = "1.6"
186+
cfg-if = "1"
216187

217188
[lints]
218189
workspace = true

‎crates/dpapi-core/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ std = []
99
alloc = []
1010

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

1515
[lints]

‎crates/dpapi-native-transport/Cargo.toml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ publish = false # not ready yet
66

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

1717
[lints]

‎crates/dpapi-pdu/Cargo.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ arbitrary = ["uuid/arbitrary", "bitflags/arbitrary", "dep:arbitrary", "std"]
1010

1111
[dependencies]
1212
dpapi-core = { workspace = true, features = ["alloc"] }
13-
uuid.workspace = true
14-
crypto-bigint.workspace = true
15-
bitflags.workspace = true
16-
num-derive.workspace = true
17-
num-traits = { workspace = true, default-features = true }
13+
uuid = { version = "1.23", default-features = false }
14+
crypto-bigint = { version = "0.7", default-features = false, features = ["alloc"] }
15+
bitflags = "2.11"
16+
num-derive = "0.5"
17+
num-traits = { version = "0.2", default-features = true }
1818

1919
thiserror = { version = "2.0", default-features = false }
2020
arbitrary = { version = "1", optional = true, features = ["derive"] }

‎crates/dpapi-transport/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ publish = false # not ready yet
1313
[dependencies]
1414
url = "2.5"
1515
thiserror = "2.0"
16-
uuid.workspace = true
16+
uuid = { version = "1.23", default-features = false }
1717

1818
[lints]
1919
workspace = true

‎crates/dpapi-web/Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ tracing-web = "0.1"
3838
futures-util = { version = "0.3", features = ["io"] }
3939

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

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

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

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

6565
[lints]
6666
workspace = true

‎crates/dpapi/Cargo.toml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,23 @@ name = "dpapi"
1717
tsssp = ["sspi/tsssp"]
1818

1919
[dependencies]
20-
bitflags.workspace = true
21-
byteorder.workspace = true
22-
num-derive.workspace = true
23-
num-traits = { workspace = true, default-features = true }
24-
uuid = { workspace = true, features = ["std"] }
25-
picky-asn1.workspace = true
26-
picky-asn1-der.workspace = true
27-
picky-krb.workspace = true
28-
picky-asn1-x509 = { workspace = true, features = ["pkcs7"] }
29-
sha1.workspace = true
30-
sha2.workspace = true
31-
rand.workspace = true
32-
rand_core.workspace = true
33-
hmac.workspace = true
20+
bitflags = "2.11"
21+
byteorder = "1.5"
22+
num-derive = "0.5"
23+
num-traits = { version = "0.2", default-features = true }
24+
uuid = { version = "1.23", default-features = false, features = ["std"] }
25+
picky-asn1 = "0.10"
26+
picky-asn1-der = "0.5"
27+
picky-krb = "0.12"
28+
picky-asn1-x509 = { version = "0.15", features = ["pkcs7"] }
29+
sha1 = { version = "0.11", default-features = false }
30+
sha2 = "0.11"
31+
rand = "0.10"
32+
rand_core = "0.10"
33+
hmac = "0.13"
3434
digest = "0.11"
35-
tracing = { workspace = true, default-features = true }
36-
whoami.workspace = true
35+
tracing = { version = "0.1", default-features = true }
36+
whoami = "2.1"
3737

3838
dpapi-core = { workspace = true, features = ["alloc"] }
3939
dpapi-pdu.workspace = true

‎crates/kdc/Cargo.toml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ authors = ["Devolutions Inc. <infos@devolutions.net>"]
1010
description = "A minimal Rust implementation of the KDC (Key Distribution Center)"
1111

1212
[dependencies]
13-
picky-asn1 = { workspace = true, features = ["time_conversion"] }
14-
picky-asn1-der.workspace = true
15-
picky-asn1-x509.workspace = true
16-
picky-krb.workspace = true
17-
tracing.workspace = true
18-
time.workspace = true
13+
picky-asn1 = { version = "0.10", features = ["time_conversion"] }
14+
picky-asn1-der = "0.5"
15+
picky-asn1-x509 = "0.15"
16+
picky-krb = "0.12"
17+
tracing = { version = "0.1", default-features = false }
18+
time = { version = "0.3", default-features = false }
1919

2020
thiserror = "2.0"
2121
argon2 = { version = "0.5", features = ["std"] }

‎crates/winscard/Cargo.toml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,24 @@ std = ["tracing/std", "base64", "picky-asn1-der"]
1616
name = "winscard"
1717

1818
[dependencies]
19-
bitflags.workspace = true
19+
bitflags = "2.11"
2020
iso7816 = "0.1"
2121
iso7816-tlv = "0.4"
22-
picky = { workspace = true, features = ["x509"] }
23-
picky-asn1-x509.workspace = true
24-
tracing = { workspace = true, features = ["attributes"] }
25-
time = { workspace = true, features = [
22+
picky = { version = "=7.0.0-rc.26", default-features = false, features = ["x509"] }
23+
picky-asn1-x509 = "0.15"
24+
tracing = { version = "0.1", default-features = false, features = ["attributes"] }
25+
time = { version = "0.3", default-features = false, features = [
2626
"formatting",
2727
] }
28-
uuid = { workspace = true, features = ["v4"] }
28+
uuid = { version = "1.23", default-features = false, features = ["v4"] }
2929
flate2 = { version = "1.1", default-features = false }
30-
rsa = { workspace = true, features = ["hazmat"] }
31-
sha1.workspace = true
32-
base64 = { workspace = true , optional = true }
33-
picky-asn1-der = { workspace = true, optional = true }
34-
num-derive.workspace = true
35-
num-traits.workspace = true
36-
crypto-bigint.workspace = true
30+
rsa = { version = "=0.10.0-rc.18", default-features = false, features = ["hazmat"] }
31+
sha1 = { version = "0.11", default-features = false }
32+
base64 = { version = "0.23", optional = true }
33+
picky-asn1-der = { version = "0.5", optional = true }
34+
num-derive = "0.5"
35+
num-traits = { version = "0.2", default-features = false }
36+
crypto-bigint = { version = "0.7", default-features = false, features = ["alloc"] }
3737
widestring = "1.2"
3838

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

4646
[dev-dependencies]
47-
proptest.workspace = true
48-
rand.workspace = true
47+
proptest = "1.6"
48+
rand = "0.10"
4949

5050
[lints]
5151
workspace = true

0 commit comments

Comments
 (0)