From 0b2709ae70d684b0560fe655533bf5ae4488c28d Mon Sep 17 00:00:00 2001
From: Tony Arcieri <bascule@gmail.com>
Date: Thu, 29 Apr 2021 08:07:04 -0700
Subject: [PATCH] Bump `password-hash` crate dependency to v0.2

Release notes: https://github.com/RustCrypto/traits/pull/624
---
 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 876f27c6..93b416d7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -258,8 +258,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "password-hash"
-version = "0.2.0-pre"
-source = "git+https://github.com/RustCrypto/traits#d6a1e128825113d29eb7fd2525a9bba161415717"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7561a874264c351c35ccde0da29a98dea5f2483357c049673319c7f3446d14da"
 dependencies = [
  "base64ct",
  "rand_core",
diff --git a/Cargo.toml b/Cargo.toml
index 73445381..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" }
diff --git a/argon2/Cargo.toml b/argon2/Cargo.toml
index 8f78bb4c..23c7a32c 100644
--- a/argon2/Cargo.toml
+++ b/argon2/Cargo.toml
@@ -16,13 +16,13 @@ readme = "README.md"
 
 [dependencies]
 blake2 = { version = "0.9", default-features = false }
-password-hash = { version = "=0.2.0-pre", optional = true }
+password-hash = { version = "0.2", optional = true }
 rayon = { version = "1", optional = true }
 zeroize = { version = "1", optional = true }
 
 [dev-dependencies]
 hex-literal = "0.3"
-password-hash = { version = "=0.2.0-pre", features = ["rand_core"] }
+password-hash = { version = "0.2", features = ["rand_core"] }
 rand_core = { version = "0.6", features = ["std"] }
 
 [features]
diff --git a/pbkdf2/Cargo.toml b/pbkdf2/Cargo.toml
index 7949bfde..c50de447 100644
--- a/pbkdf2/Cargo.toml
+++ b/pbkdf2/Cargo.toml
@@ -17,7 +17,7 @@ crypto-mac = "0.10"
 rayon = { version = "1", optional = true }
 base64ct = { version = "1", default-features = false, optional = true }
 hmac = { version = "0.10", default-features = false, optional = true }
-password-hash = { version = "=0.2.0-pre", default-features = false, optional = true, features = ["rand_core"]  }
+password-hash = { version = "0.2", 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 d06b9fb3..8a22a5c5 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.10"
-password-hash = { version = "=0.2.0-pre", default-features = false, features = ["rand_core"], optional = true }
+password-hash = { version = "0.2", default-features = false, features = ["rand_core"], optional = true }
 pbkdf2 = { version = "0.7", default-features = false, path = "../pbkdf2" }
 salsa20 = { version = "0.7", default-features = false, features = ["expose-core"] }
 sha2 = { version = "0.9", default-features = false }
 
 [dev-dependencies]
-password-hash = { version = "=0.2.0-pre", features = ["rand_core"] }
+password-hash = { version = "0.2", features = ["rand_core"] }
 rand_core = { version = "0.6", features = ["std"] }
 
 [features]