From 0421f5d5167cf3c35685bf314010760d520502c0 Mon Sep 17 00:00:00 2001
From: Tony Arcieri <bascule@gmail.com>
Date: Thu, 29 Apr 2021 11:14:47 -0700
Subject: [PATCH] Bump `ghash` to v0.4; `polyval` to v0.5 (#284)

---
 Cargo.lock             | 12 +++++++-----
 Cargo.toml             |  2 --
 aes-gcm-siv/Cargo.toml |  2 +-
 aes-gcm/Cargo.toml     |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f5d657d1..96e305d8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -277,8 +277,9 @@ dependencies = [
 
 [[package]]
 name = "ghash"
-version = "0.4.0-pre"
-source = "git+https://github.com/RustCrypto/universal-hashes.git#ed862cf2c504b3e75231147403bda4bd0229fb6a"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90df9c2964d71ba6591379cc3bff5127cc19dcbe6a62088a1b3718d6cbfe08cf"
 dependencies = [
  "opaque-debug",
  "polyval",
@@ -377,10 +378,11 @@ dependencies = [
 
 [[package]]
 name = "polyval"
-version = "0.5.0-pre"
-source = "git+https://github.com/RustCrypto/universal-hashes.git#ed862cf2c504b3e75231147403bda4bd0229fb6a"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "864231b0b86ce05168a8e6da0fea2e67275dacf25f75b00a62cfd341aab904a9"
 dependencies = [
- "cpuid-bool",
+ "cpufeatures",
  "opaque-debug",
  "universal-hash",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 10f49710..920e0aad 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,8 +14,6 @@ members = [
 [patch.crates-io]
 chacha20 = { git = "https://github.com/RustCrypto/stream-ciphers.git" }
 cmac = { git = "https://github.com/RustCrypto/MACs.git" }
-ghash = { git = "https://github.com/RustCrypto/universal-hashes.git" }
 kuznyechik = { git = "https://github.com/RustCrypto/block-ciphers.git" }
 pmac = { git = "https://github.com/RustCrypto/MACs.git" }
-polyval = { git = "https://github.com/RustCrypto/universal-hashes.git" }
 salsa20 = { git = "https://github.com/RustCrypto/stream-ciphers.git" }
diff --git a/aes-gcm-siv/Cargo.toml b/aes-gcm-siv/Cargo.toml
index d14f87ed..30be1ae0 100644
--- a/aes-gcm-siv/Cargo.toml
+++ b/aes-gcm-siv/Cargo.toml
@@ -20,7 +20,7 @@ aead = { version = "0.4", default-features = false }
 aes = { version = "0.7", optional = true }
 cipher = "0.3"
 ctr = "0.7"
-polyval = { version = "=0.5.0-pre", default-features = false }
+polyval = { version = "0.5", default-features = false }
 subtle = { version = "2", default-features = false }
 zeroize = { version = "1", default-features = false }
 
diff --git a/aes-gcm/Cargo.toml b/aes-gcm/Cargo.toml
index 9dc1f475..f5a2873d 100644
--- a/aes-gcm/Cargo.toml
+++ b/aes-gcm/Cargo.toml
@@ -20,7 +20,7 @@ aead = { version = "0.4", default-features = false }
 aes = { version = "0.7", optional = true }
 cipher = "0.3"
 ctr = "0.7"
-ghash = { version = "=0.4.0-pre", default-features = false }
+ghash = { version = "0.4", default-features = false }
 subtle = { version = "2", default-features = false }
 zeroize = { version = "1", optional = true, default-features = false }