Skip to content

Commit 01ed6ea

Browse files
authored
chore(deps): bump rust-argon2 from 2.1.0 to 3.0.0 (#573)
[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=rust-argon2&package-manager=cargo&previous-version=2.1.0&new-version=3.0.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details>
2 parents 189c46a + 87ec8b3 commit 01ed6ea

File tree

3 files changed

+22
-14
lines changed

3 files changed

+22
-14
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ sha1 = "0.10.6"
4040
sha2 = "0.10.9"
4141
chacha20poly1305 = "0.10.1"
4242
getrandom = "0.3.3"
43-
rust-argon2 = "2.1.0"
43+
rust-argon2 = "3.0.0"
4444
scrypt = "0.11.0"
4545
aes-gcm = "0.10.3"
4646
hex = "0.4.3"

src/crypto/cryptography.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use argon2::{Config, Variant, Version};
1+
use argon2::{Config, ThreadMode, Variant, Version};
22
use chacha20poly1305::aead::Aead;
33
use chacha20poly1305::{Key, KeyInit, XChaCha20Poly1305, XNonce};
44
use color_eyre::eyre::{ErrReport, eyre};
@@ -18,6 +18,7 @@ const KEY_DERIVATION_CONFIG: Config = Config {
1818
secret: &[],
1919
ad: &[],
2020
hash_length: XCHACHA20_POLY1305_KEY_LENGTH as u32,
21+
thread_mode: ThreadMode::Sequential,
2122
};
2223

2324
pub fn argon_derive_key(password_bytes: &[u8], salt: &[u8]) -> color_eyre::Result<Vec<u8>> {

0 commit comments

Comments
 (0)