From 555ae1d82d000f01899498f969e6dc1d0a4fe467 Mon Sep 17 00:00:00 2001
From: Tony Arcieri <bascule@gmail.com>
Date: Sat, 19 Mar 2022 10:07:06 -0600
Subject: [PATCH] Remove `subtle` pinning

Version pinning to preserve MSRV has proven to be problematic, in that
it prevents compatible combinations of crates from working due to
artificial restrictions intended to preserve out-of-the-box nameplate
MSRV on particular crates.

Since we're bumping MSRV in these crates anyway as part of the `cipher`
upgrade, this commit removes these restrictions, which should allow more
compatible combinations of crates to work.
---
 aes-gcm-siv/Cargo.toml      | 2 +-
 aes-gcm/Cargo.toml          | 2 +-
 ccm/Cargo.toml              | 2 +-
 deoxys/Cargo.toml           | 2 +-
 eax/Cargo.toml              | 2 +-
 mgm/Cargo.toml              | 2 +-
 xsalsa20poly1305/Cargo.toml | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/aes-gcm-siv/Cargo.toml b/aes-gcm-siv/Cargo.toml
index 6178e0ce..7afa30f2 100644
--- a/aes-gcm-siv/Cargo.toml
+++ b/aes-gcm-siv/Cargo.toml
@@ -21,7 +21,7 @@ aes = { version = "0.7.5", optional = true }
 cipher = "0.3"
 ctr = "0.8"
 polyval = { version = "0.5.1", default-features = false }
-subtle = { version = ">=2, <2.5", default-features = false }
+subtle = { version = "2", default-features = false }
 zeroize = { version = "1", default-features = false }
 
 [dev-dependencies]
diff --git a/aes-gcm/Cargo.toml b/aes-gcm/Cargo.toml
index d468fd6d..10df5520 100644
--- a/aes-gcm/Cargo.toml
+++ b/aes-gcm/Cargo.toml
@@ -21,7 +21,7 @@ aes = { version = "0.7.5", optional = true }
 cipher = "0.3"
 ctr = "0.8"
 ghash = { version = "0.4.2", default-features = false }
-subtle = { version = ">=2, <2.5", default-features = false }
+subtle = { version = "2", default-features = false }
 zeroize = { version = "1", optional = true, default-features = false }
 
 [dev-dependencies]
diff --git a/ccm/Cargo.toml b/ccm/Cargo.toml
index f91e176e..3faeb977 100644
--- a/ccm/Cargo.toml
+++ b/ccm/Cargo.toml
@@ -16,7 +16,7 @@ keywords = ["encryption", "aead"]
 aead = { version = "0.4", default-features = false }
 cipher = { version = "0.3", default-features = false }
 ctr = { version = "0.8", default-features = false }
-subtle = { version = ">=2, <2.5", default-features = false }
+subtle = { version = "2", default-features = false }
 
 [dev-dependencies]
 aead = { version = "0.4", features = ["dev"], default-features = false }
diff --git a/deoxys/Cargo.toml b/deoxys/Cargo.toml
index 84ecd5e7..64fc128e 100644
--- a/deoxys/Cargo.toml
+++ b/deoxys/Cargo.toml
@@ -19,7 +19,7 @@ edition = "2018"
 [dependencies]
 aead = { version = "0.4", default-features = false }
 aes = { version = "0.7.5", features=["hazmat"], default-features = false }
-subtle = { version = ">=2, <2.5", default-features = false }
+subtle = { version = "2", default-features = false }
 zeroize = { version = "1", default-features = false }
 
 [dev-dependencies]
diff --git a/eax/Cargo.toml b/eax/Cargo.toml
index afa5c16a..1395315d 100644
--- a/eax/Cargo.toml
+++ b/eax/Cargo.toml
@@ -23,7 +23,7 @@ aead = { version = "0.4", default-features = false }
 cipher = "0.3"
 cmac = "0.6"
 ctr = "0.8"
-subtle = { version = ">=2, <2.5", default-features = false }
+subtle = { version = "2", default-features = false }
 
 [dev-dependencies]
 aead = { version = "0.4", features = ["dev"], default-features = false }
diff --git a/mgm/Cargo.toml b/mgm/Cargo.toml
index 2225c51f..b0d83a03 100644
--- a/mgm/Cargo.toml
+++ b/mgm/Cargo.toml
@@ -15,7 +15,7 @@ keywords = ["encryption", "aead"]
 [dependencies]
 aead = { version = "0.4", default-features = false }
 cipher = "0.3"
-subtle = { version = ">=2, <2.5", default-features = false }
+subtle = { version = "2", default-features = false }
 cfg-if = "1"
 
 [target.'cfg(any(target_arch = "x86_64", target_arch = "x86"))'.dependencies]
diff --git a/xsalsa20poly1305/Cargo.toml b/xsalsa20poly1305/Cargo.toml
index bf437d1f..3a96aa41 100644
--- a/xsalsa20poly1305/Cargo.toml
+++ b/xsalsa20poly1305/Cargo.toml
@@ -19,7 +19,7 @@ aead = { version = "0.4", default-features = false }
 salsa20 = { version = "0.10", features = ["zeroize"] }
 poly1305 = "0.7"
 rand_core = { version = "0.6", optional = true }
-subtle = { version = ">=2, <2.5", default-features = false }
+subtle = { version = "2", default-features = false }
 zeroize = { version = "1", default-features = false }
 
 [features]