Skip to content

Commit

Permalink
Relax subtle and zeroize requirements
Browse files Browse the repository at this point in the history
The version was pinned to `subtle` 2.4.x and `zeroize` 1.3.x to prevent
MSRV breakages, but these crates are comaptible with any version before
that as well.

This commit loosens the restrictions to allow compatibility with earlier
versions of these crates too. This permits a wider range of
combinations.
  • Loading branch information
tarcieri committed Aug 28, 2021
1 parent 5a019ea commit e92b33f
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions aes-gcm-siv/Cargo.toml
Expand Up @@ -21,8 +21,8 @@ aes = { version = "0.7.5", optional = true }
cipher = "0.3"
ctr = "0.8"
polyval = { version = "0.5.1", default-features = false }
subtle = { version = "=2.4", default-features = false }
zeroize = { version = "=1.3", default-features = false }
subtle = { version = ">=2, <2.5", default-features = false }
zeroize = { version = ">=1, <1.4", default-features = false }

[dev-dependencies]
aead = { version = "0.4", features = ["dev"], default-features = false }
Expand Down
4 changes: 2 additions & 2 deletions aes-gcm/Cargo.toml
Expand Up @@ -21,8 +21,8 @@ aes = { version = "0.7.5", optional = true }
cipher = "0.3"
ctr = "0.8"
ghash = { version = "0.4.2", default-features = false }
subtle = { version = "=2.4", default-features = false }
zeroize = { version = "=1.3", optional = true, default-features = false }
subtle = { version = ">=2, <2.5", default-features = false }
zeroize = { version = ">=1, <1.4", optional = true, default-features = false }

[dev-dependencies]
aead = { version = "0.4", features = ["dev"], default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion aes-siv/Cargo.toml
Expand Up @@ -24,7 +24,7 @@ crypto-mac = "0.11"
ctr = "0.8"
dbl = "0.3"
pmac = { version = "0.6", optional = true }
zeroize = { version = "=1.3", default-features = false }
zeroize = { version = ">=1, <1.4", default-features = false }

[dev-dependencies]
blobby = "0.3"
Expand Down
2 changes: 1 addition & 1 deletion ccm/Cargo.toml
Expand Up @@ -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.4", default-features = false }
subtle = { version = ">=2, <2.5", default-features = false }

[dev-dependencies]
aead = { version = "0.4", features = ["dev"], default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion chacha20poly1305/Cargo.toml
Expand Up @@ -22,7 +22,7 @@ aead = { version = "0.4", default-features = false }
chacha20 = { version = "0.7", features = ["zeroize"], optional = true }
cipher = "0.3"
poly1305 = "0.7"
zeroize = { version = "=1.3", default-features = false }
zeroize = { version = ">=1, <1.4", default-features = false }

[dev-dependencies]
aead = { version = "0.4", features = ["dev"], default-features = false }
Expand Down
6 changes: 3 additions & 3 deletions deoxys/Cargo.toml
Expand Up @@ -18,9 +18,9 @@ edition = "2018"

[dependencies]
aead = { version = "0.4", default-features = false }
subtle = { version = "=2.4", default-features = false }
zeroize = { version = "=1.3", default-features = false }
aes = { version = "0.7.5", features=["hazmat"], default-features = false}
aes = { version = "0.7.5", features=["hazmat"], default-features = false }
subtle = { version = ">=2, <2.5", default-features = false }
zeroize = { version = ">=1, <1.4", default-features = false }

[dev-dependencies]
aead = { version = "0.4", features = ["dev"], default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion eax/Cargo.toml
Expand Up @@ -23,7 +23,7 @@ aead = { version = "0.4", default-features = false }
cipher = "0.3"
cmac = "0.6"
ctr = "0.8"
subtle = { version = "=2.4", default-features = false }
subtle = { version = ">=2, <2.5", default-features = false }

[dev-dependencies]
aead = { version = "0.4", features = ["dev"], default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion mgm/Cargo.toml
Expand Up @@ -15,7 +15,7 @@ keywords = ["encryption", "aead"]
[dependencies]
aead = { version = "0.4", default-features = false }
cipher = "0.3"
subtle = { version = "=2.4", default-features = false }
subtle = { version = ">=2, <2.5", default-features = false }

[dev-dependencies]
aead = { version = "0.4", features = ["dev"], default-features = false }
Expand Down
4 changes: 2 additions & 2 deletions xsalsa20poly1305/Cargo.toml
Expand Up @@ -19,8 +19,8 @@ aead = { version = "0.4", default-features = false }
salsa20 = { version = "0.8", features = ["xsalsa20", "zeroize"] }
poly1305 = "0.7"
rand_core = { version = "0.6", optional = true }
subtle = { version = "=2.4", default-features = false }
zeroize = { version = "=1.3", default-features = false }
subtle = { version = ">=2, <2.5", default-features = false }
zeroize = { version = ">=1, <1.4", default-features = false }

[features]
default = ["alloc", "rand_core", "aead/rand_core"]
Expand Down

0 comments on commit e92b33f

Please sign in to comment.