From 8c5faec8e2b45556cd05e692f3030a92bb884216 Mon Sep 17 00:00:00 2001
From: Tony Arcieri <bascule@gmail.com>
Date: Tue, 9 Jun 2020 21:12:26 -0700
Subject: [PATCH] Upgrade to hmac v0.8; sha2 v0.9 crate releases

---
 Cargo.toml        | 10 ----------
 pbkdf2/Cargo.toml | 10 +++++-----
 scrypt/Cargo.toml |  5 ++---
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 65c21d4f..02c0e2d1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,13 +3,3 @@ members = [
     "pbkdf2",
     "scrypt",
 ]
-
-[patch.crates-io]
-block-buffer = { git = "https://github.com/RustCrypto/utils" }
-crypto-mac = { git = "https://github.com/RustCrypto/traits" }
-digest = { git = "https://github.com/RustCrypto/traits" }
-hmac = { git = "https://github.com/RustCrypto/MACs" }
-salsa20 = { git = "https://github.com/RustCrypto/stream-ciphers" }
-sha-1 = { git = "https://github.com/RustCrypto/hashes" }
-sha2 = { git = "https://github.com/RustCrypto/hashes" }
-stream-cipher = { git = "https://github.com/RustCrypto/traits" }
diff --git a/pbkdf2/Cargo.toml b/pbkdf2/Cargo.toml
index 8ea7e16e..ddce8c02 100644
--- a/pbkdf2/Cargo.toml
+++ b/pbkdf2/Cargo.toml
@@ -17,14 +17,14 @@ byteorder = { version = "1", default-features = false }
 rayon = { version = "1", optional = true }
 base64 = { version = "0.9", optional = true }
 rand = { version = "0.5", optional = true }
-hmac = { version = "= 0.8.0-pre", optional = true }
-sha2 = { version = "= 0.9.0-pre", optional = true }
+hmac = { version = "0.8", optional = true }
+sha2 = { version = "0.9", optional = true }
 subtle = { version = "2", default-features = false , optional = true }
 
 [dev-dependencies]
-hmac = "= 0.8.0-pre"
-sha-1 = "= 0.9.0-pre"
-sha2 = "= 0.9.0-pre"
+hmac = "0.8"
+sha-1 = "0.9"
+sha2 = "0.9"
 
 [features]
 default = ["include_simple"]
diff --git a/scrypt/Cargo.toml b/scrypt/Cargo.toml
index 5228694d..02a498e9 100644
--- a/scrypt/Cargo.toml
+++ b/scrypt/Cargo.toml
@@ -14,11 +14,10 @@ edition = "2018"
 base64 = { version = "0.9", optional = true }
 byte-tools = "0.3"
 byteorder = { version = "1", default-features = false }
-hmac = "= 0.8.0-pre"
+hmac = "0.8"
 pbkdf2 = { version = "= 0.4.0-pre", default-features = false, path = "../pbkdf2" }
 rand = { version = "0.5", optional = true }
-sha2 = { version = "= 0.9.0-pre", default-features = false }
-salsa20 = "= 0.5.0-pre"
+sha2 = { version = "0.9", default-features = false }
 subtle = { version = "2", default-features = false , optional = true }
 
 [features]