From ee6f3deeb1caf21b39103f967fd79b2e0dfc46ee Mon Sep 17 00:00:00 2001 From: Maximiliano Sandoval Date: Sat, 10 Jan 2026 12:40:15 +0100 Subject: [PATCH 1/4] cargo: Fix indentation in members list --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index fc19ed23b..2c450df56 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ resolver = "2" members = [ - "cargo-credential", + "cargo-credential", "client", "cli", "macros", From 64d3eb30f6889d4bff532bc0e17d932beea15094 Mon Sep 17 00:00:00 2001 From: Maximiliano Sandoval Date: Sat, 10 Jan 2026 23:52:44 +0100 Subject: [PATCH 2/4] cargo: Set workspace.resolver to 3 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 2c450df56..bd0ab2b38 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace] -resolver = "2" +resolver = "3" members = [ "cargo-credential", From 23234139449263c2c2fd2631ae7ee430c0d4a616 Mon Sep 17 00:00:00 2001 From: Maximiliano Sandoval Date: Sat, 10 Jan 2026 23:53:28 +0100 Subject: [PATCH 3/4] cargo: Set msrv to 1.86 We are using cargo-credential 0.4.9 which already uses 1.86. --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index bd0ab2b38..1abb97b51 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ categories = ["os::linux-apis", "os", "api-bindings"] repository = "https://github.com/bilelmoussaoui/oo7" homepage = "https://github.com/bilelmoussaoui/oo7" license = "MIT" -rust-version = "1.85" +rust-version = "1.86" exclude = ["org.freedesktop.Secrets.xml"] [workspace.dependencies] From a7620cac2072311d0e6ca79e4bc63433873fa0c6 Mon Sep 17 00:00:00 2001 From: Maximiliano Sandoval Date: Sat, 10 Jan 2026 23:57:31 +0100 Subject: [PATCH 4/4] cargo: Move num-bigint-dif to workspace --- Cargo.toml | 1 + client/Cargo.toml | 2 +- server/Cargo.toml | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 1abb97b51..edfa43c24 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,6 +32,7 @@ clap = { version = "4.5", features = [ "cargo", "derive" ] } futures-channel = "0.3" futures-lite = "2.6" futures-util = "0.3" +num-bigint-dig = { version = "0.8", features = ["zeroize"] } oo7 = { path = "client", version = "0.6", default-features = false, features = ["unstable", "tracing"]} serde = { version = "1.0", features = ["derive"] } tokio = { version = "1.48", default-features = false } diff --git a/client/Cargo.toml b/client/Cargo.toml index 1a0e9c117..bece684dc 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -34,7 +34,7 @@ hkdf = { version = "0.12", optional = true } hmac = { version = "0.12", optional = true } md-5 = { version = "0.10", optional = true } num = "0.4.0" -num-bigint-dig = { version = "0.8", features = ["zeroize"] } +num-bigint-dig.workspace = true openssl = { version = "0.10", optional = true } pbkdf2 = { version = "0.12", optional = true } rand = { version = "0.9", default-features = false, features = ["thread_rng"] } diff --git a/server/Cargo.toml b/server/Cargo.toml index bef2667c5..f0991c749 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -21,7 +21,7 @@ hkdf = { version = "0.12", optional = true } libc = "0.2" nix = { version = "0.30", default-features = false, features = ["user"]} num = "0.4.0" -num-bigint-dig = { version = "0.8", features = ["zeroize"] } +num-bigint-dig.workspace = true openssl = { version = "0.10", optional = true } oo7 = { workspace = true, features = ["tokio"] } rpassword = "7.4" @@ -49,4 +49,4 @@ openssl_crypto = [ [dev-dependencies] serial_test = "3.3" -tempfile.workspace = true \ No newline at end of file +tempfile.workspace = true