From afc5fad3d8592566d708eca29f18067967e60873 Mon Sep 17 00:00:00 2001
From: Tony Arcieri <bascule@gmail.com>
Date: Fri, 27 Aug 2021 16:21:30 -0600
Subject: [PATCH] Bump `password-hash` to v0.3

Release notes: https://github.com/RustCrypto/traits/pull/724
---
 Cargo.lock        | 5 +++--
 Cargo.toml        | 3 ---
 argon2/Cargo.toml | 4 ++--
 pbkdf2/Cargo.toml | 2 +-
 scrypt/Cargo.toml | 4 ++--
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1e7012dc..55725160 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -269,8 +269,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "password-hash"
-version = "0.3.0-pre.1"
-source = "git+https://github.com/rustcrypto/traits.git#c759117b348ec195fab4ec835c260f0b4c402389"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ad7268ef9bc463fddde8361d358fbfae1aeeb1fb62eca111cd8c763bf1c5891"
 dependencies = [
  "base64ct",
  "rand_core",
diff --git a/Cargo.toml b/Cargo.toml
index bce2bf21..1f251097 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,6 +6,3 @@ members = [
     "scrypt",
     "sha-crypt"
 ]
-
-[patch.crates-io]
-password-hash = { git = "https://github.com/rustcrypto/traits.git" }
diff --git a/argon2/Cargo.toml b/argon2/Cargo.toml
index 779e27c6..b08cb954 100644
--- a/argon2/Cargo.toml
+++ b/argon2/Cargo.toml
@@ -17,13 +17,13 @@ readme = "README.md"
 [dependencies]
 base64ct = "1"
 blake2 = { version = "0.9", default-features = false }
-password-hash = { version = "=0.3.0-pre.1", optional = true }
+password-hash = { version = "0.3", optional = true }
 rayon = { version = "1", optional = true }
 zeroize = { version = ">=1, <1.4", optional = true }
 
 [dev-dependencies]
 hex-literal = "0.3"
-password-hash = { version = "=0.3.0-pre.1", features = ["rand_core"] }
+password-hash = { version = "0.3", features = ["rand_core"] }
 
 [features]
 default = ["alloc", "password-hash", "rand"]
diff --git a/pbkdf2/Cargo.toml b/pbkdf2/Cargo.toml
index b3c4e0e2..37709cfe 100644
--- a/pbkdf2/Cargo.toml
+++ b/pbkdf2/Cargo.toml
@@ -17,7 +17,7 @@ crypto-mac = "0.11"
 rayon = { version = "1", optional = true }
 base64ct = { version = "1", default-features = false, optional = true }
 hmac = { version = "0.11", default-features = false, optional = true }
-password-hash = { version = "=0.3.0-pre.1", default-features = false, optional = true, features = ["rand_core"]  }
+password-hash = { version = "0.3", default-features = false, optional = true, features = ["rand_core"]  }
 sha1 = { version = "0.9", package = "sha-1", default-features = false, optional = true }
 sha2 = { version = "0.9", default-features = false, optional = true }
 
diff --git a/scrypt/Cargo.toml b/scrypt/Cargo.toml
index 5d6980c6..593f6b56 100644
--- a/scrypt/Cargo.toml
+++ b/scrypt/Cargo.toml
@@ -14,13 +14,13 @@ readme = "README.md"
 [dependencies]
 base64ct = { version = "1", default-features = false, features = ["alloc"], optional = true }
 hmac = "0.11"
-password-hash = { version = "=0.3.0-pre.1", default-features = false, features = ["rand_core"], optional = true }
+password-hash = { version = "0.3", default-features = false, features = ["rand_core"], optional = true }
 pbkdf2 = { version = "0.8", default-features = false, path = "../pbkdf2" }
 salsa20 = { version = "0.8", default-features = false, features = ["expose-core"] }
 sha2 = { version = "0.9", default-features = false }
 
 [dev-dependencies]
-password-hash = { version = "=0.3.0-pre.1", features = ["rand_core"] }
+password-hash = { version = "0.3", features = ["rand_core"] }
 
 [features]
 default = ["simple", "std"]