From 6253063cd84146d6e3e1298509d606b8d5053e20 Mon Sep 17 00:00:00 2001
From: "oxide-renovate[bot]"
 <146848827+oxide-renovate[bot]@users.noreply.github.com>
Date: Tue, 9 Jan 2024 04:09:22 +0000
Subject: [PATCH 1/2] Update Rust crate argon2alt to v2

---
 Cargo.lock           | 5 ++---
 passwords/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d9d85bdc79..4d2bbcfced 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6996,14 +6996,13 @@ dependencies = [
 
 [[package]]
 name = "rust-argon2"
-version = "1.0.1"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5885493fdf0be6cdff808d1533ce878d21cfa49c7086fa00c66355cd9141bfc"
+checksum = "9d9848531d60c9cbbcf9d166c885316c24bc0e2a9d3eba0956bb6cbbd79bc6e8"
 dependencies = [
  "base64",
  "blake2b_simd",
  "constant_time_eq 0.3.0",
- "crossbeam-utils",
 ]
 
 [[package]]
diff --git a/passwords/Cargo.toml b/passwords/Cargo.toml
index 8adcf75a2e..25c521b8ec 100644
--- a/passwords/Cargo.toml
+++ b/passwords/Cargo.toml
@@ -14,7 +14,7 @@ serde_with.workspace = true
 omicron-workspace-hack.workspace = true
 
 [dev-dependencies]
-argon2alt = { package = "rust-argon2", version = "1.0" }
+argon2alt = { package = "rust-argon2", version = "2.1" }
 criterion.workspace = true
 
 [[bench]]

From ed31da29c6f3f0bd1b4df7c05687af99348a02b4 Mon Sep 17 00:00:00 2001
From: Rain <rain@oxide.computer>
Date: Tue, 2 Apr 2024 11:35:07 -0700
Subject: [PATCH 2/2] remove option that no longer exists

---
 passwords/Cargo.toml | 2 +-
 passwords/src/lib.rs | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/passwords/Cargo.toml b/passwords/Cargo.toml
index a653e347d2..bb411a9449 100644
--- a/passwords/Cargo.toml
+++ b/passwords/Cargo.toml
@@ -14,7 +14,7 @@ serde_with.workspace = true
 omicron-workspace-hack.workspace = true
 
 [dev-dependencies]
-argon2alt = { package = "rust-argon2", version = "2.1" }
+argon2alt = { package = "rust-argon2", version = "2.1.0" }
 criterion.workspace = true
 
 [[bench]]
diff --git a/passwords/src/lib.rs b/passwords/src/lib.rs
index ca2292420c..c7e9f1a118 100644
--- a/passwords/src/lib.rs
+++ b/passwords/src/lib.rs
@@ -563,7 +563,6 @@ mod test {
             mem_cost: ARGON2_COST_M_KIB,
             time_cost: ARGON2_COST_T,
             lanes: ARGON2_COST_P,
-            thread_mode: argon2alt::ThreadMode::Sequential,
             secret: &[],
             ad: &[],
             hash_length: 32,