Skip to content

Commit 75f69c4

Browse files
Update dependencies
1 parent 9e6c80a commit 75f69c4

7 files changed

Lines changed: 38 additions & 15 deletions

File tree

Cargo.lock

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

Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ tokio = { version = "1.43", default-features = false }
3434
tempfile = "3.15"
3535
tracing = "0.1"
3636
tracing-subscriber = "0.3"
37-
zbus = { version = "5.0", default-features = false }
37+
zbus = { version = "5.5", default-features = false }
38+
zbus_macros = {version = "5.5", features = ["gvariant"]}
3839
zeroize = { version = "1", features = ["zeroize_derive"] }
3940
zvariant = { version = "5.2", default-features = false, features = ["gvariant"]}

client/Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ digest = { version = "0.10", optional = true }
2828
endi.workspace = true
2929
futures-lite = { workspace = true, optional = true }
3030
futures-util.workspace = true
31-
getrandom = "0.2"
31+
getrandom = "0.3"
3232
hkdf = { version = "0.12", optional = true }
3333
hmac = { version = "0.12", optional = true }
3434
md-5 = { version = "0.10", optional = true }
3535
num = "0.4.0"
3636
num-bigint-dig = { version = "0.8", features = ["zeroize"] }
3737
openssl = { version = "0.10", optional = true }
3838
pbkdf2 = { version = "0.12", optional = true }
39-
rand = { version = "0.8", default-features = false }
39+
rand = { version = "0.9", default-features = false, features = ["thread_rng"] }
4040
serde.workspace = true
4141
sha2 = { version = "0.10", optional = true }
4242
subtle = { version = "2.5", optional = true }
@@ -47,6 +47,7 @@ tokio = { workspace = true, features = [
4747
], optional = true, default-features = false }
4848
tracing = { workspace = true, optional = true }
4949
zbus.workspace = true
50+
zbus_macros.workspace = true
5051
zvariant.workspace = true
5152
zeroize.workspace = true
5253

client/src/file/api/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ pub struct Keyring {
8585
impl Keyring {
8686
#[allow(clippy::new_without_default)]
8787
pub(crate) fn new() -> Self {
88-
let salt = rand::thread_rng().gen::<[u8; DEFAULT_SALT_SIZE]>().to_vec();
88+
let salt = rand::rng().random::<[u8; DEFAULT_SALT_SIZE]>().to_vec();
8989

9090
Self {
9191
salt_size: salt.len() as u32,
@@ -120,8 +120,8 @@ impl Keyring {
120120
mtime: Option<std::time::SystemTime>,
121121
) -> Result<(), Error> {
122122
let tmp_path = if let Some(parent) = path.as_ref().parent() {
123-
let rnd: String = rand::thread_rng()
124-
.sample_iter(&rand::distributions::Alphanumeric)
123+
let rnd: String = rand::rng()
124+
.sample_iter(&rand::distr::Alphanumeric)
125125
.take(16)
126126
.map(char::from)
127127
.collect();
@@ -285,7 +285,7 @@ impl Keyring {
285285

286286
// Reset Keyring content
287287
pub(crate) fn reset(&mut self) {
288-
let salt = rand::thread_rng().gen::<[u8; DEFAULT_SALT_SIZE]>().to_vec();
288+
let salt = rand::rng().random::<[u8; DEFAULT_SALT_SIZE]>().to_vec();
289289
self.salt_size = salt.len() as u32;
290290
self.salt = salt;
291291
self.iteration_count = DEFAULT_ITERATION_COUNT;

client/src/secret.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ impl Secret {
1717
pub fn random() -> Result<Self, getrandom::Error> {
1818
let mut secret = [0; 64];
1919
// Equivalent of `ring::rand::SecureRandom`
20-
getrandom::getrandom(&mut secret)?;
20+
getrandom::fill(&mut secret)?;
2121

2222
Ok(Self::blob(secret))
2323
}

deny.toml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,27 @@ allow = [
1414
"MIT",
1515
"Apache-2.0", # rpassword by cli only
1616
"BSD-3-Clause", # used by subtle -> digest
17-
"Unicode-DFS-2016", # used by unicode-ident -> proc-macro2
1817
"Unicode-3.0", # used by icu_collections -> url
1918
]
2019

20+
[sources]
21+
allow-git = [
22+
"https://github.com/bilelmoussaoui/ashpd"
23+
]
24+
2125
[bans]
2226
multiple-versions = "deny"
2327
wildcards = "deny"
2428
highlight = "all"
29+
skip = [
30+
# num-bigint-dig & crypto_common
31+
{name = "rand_core", version = "0.6.4"},
32+
# num-bigint-dig
33+
{name = "rand_chacha", version = "0.3.1"},
34+
# num-bigint-dig
35+
{name = "rand", version = "0.8.5"},
36+
# num-bigint-dig -> ppv-lite86
37+
{name = "zerocopy", version = "0.7.35"},
38+
# num-bigint-dig & crypto_common
39+
{name = "getrandom", version = "0.2.15"},
40+
]

portal/src/main.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ mod error;
33

44
use ashpd::{
55
async_trait,
6+
desktop::HandleToken,
67
zbus::{self, zvariant::OwnedValue},
78
AppID,
89
};
@@ -17,13 +18,14 @@ struct Secret;
1718

1819
#[async_trait::async_trait]
1920
impl ashpd::backend::request::RequestImpl for Secret {
20-
async fn close(&self) {}
21+
async fn close(&self, _token: HandleToken) {}
2122
}
2223

2324
#[async_trait::async_trait]
2425
impl ashpd::backend::secret::SecretImpl for Secret {
2526
async fn retrieve(
2627
&self,
28+
_token: HandleToken,
2729
app_id: ashpd::AppID,
2830
fd: std::os::fd::OwnedFd,
2931
) -> ashpd::backend::Result<HashMap<String, OwnedValue>> {

0 commit comments

Comments
 (0)