Skip to content

Commit

Permalink
Pin zeroize dependency to v1.4 and subtle to v2.4 (#689)
Browse files Browse the repository at this point in the history
* Pin zeroize dependency to v1.4 and subtle to v2.4

* update Cargo.lock

* cherry-pick crypto-mac changes from #691
  • Loading branch information
newpavlov committed Jul 20, 2021
1 parent 3c3051d commit f5a24d8
Show file tree
Hide file tree
Showing 13 changed files with 57 additions and 27 deletions.
26 changes: 13 additions & 13 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions crypto-mac/CHANGELOG.md
Expand Up @@ -11,6 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

[#683]: https://github.com/RustCrypto/traits/pull/683

## 0.11.1 (2021-07-20)
### Changed
- Pin `subtle` dependency to v2.4 ([#691])

[#691]: https://github.com/RustCrypto/traits/pull/691

## 0.11.0 (2021-04-28)
### Added
- `generate_key` method to `New*` trait ([#513])
Expand All @@ -23,6 +29,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
[#513]: https://github.com/RustCrypto/traits/pull/513
[#621]: https://github.com/RustCrypto/traits/pull/621

## 0.10.1 (2021-07-20)
### Changed
- Pin `subtle` dependency to v2.4 ([#690])

[#690]: https://github.com/RustCrypto/traits/pull/690

## 0.10.0 (2020-10-15)
### Changed
- Replace `block-cipher` crate with new `cipher` crate ([#337], [#338])
Expand Down
4 changes: 2 additions & 2 deletions crypto-mac/Cargo.toml
@@ -1,7 +1,7 @@
[package]
name = "crypto-mac"
description = "Trait for Message Authentication Code (MAC) algorithms"
version = "0.12.0-pre"
version = "0.12.0-pre" # Also update html_root_url in lib.rs when bumping this
authors = ["RustCrypto Developers"]
license = "MIT OR Apache-2.0"
readme = "README.md"
Expand All @@ -15,7 +15,7 @@ categories = ["cryptography", "no-std"]
generic-array = "0.14"
crypto-common = { version = "=0.1.0-pre", path = "../crypto-common" }
cipher = { version = "=0.4.0-pre", path = "../cipher" }
subtle = { version = "2", default-features = false }
subtle = { version = "=2.4", default-features = false }

blobby = { version = "0.3", optional = true }
rand_core = { version = "0.6", optional = true }
Expand Down
3 changes: 2 additions & 1 deletion crypto-mac/src/lib.rs
Expand Up @@ -4,7 +4,8 @@
#![cfg_attr(docsrs, feature(doc_cfg))]
#![doc(
html_logo_url = "https://raw.githubusercontent.com/RustCrypto/media/8f1a9894/logo.svg",
html_favicon_url = "https://raw.githubusercontent.com/RustCrypto/media/8f1a9894/logo.svg"
html_favicon_url = "https://raw.githubusercontent.com/RustCrypto/media/8f1a9894/logo.svg",
html_root_url = "https://docs.rs/crypto-mac/0.12.0-pre"
)]
#![forbid(unsafe_code)]
#![warn(missing_docs, rust_2018_idioms)]
Expand Down
6 changes: 6 additions & 0 deletions elliptic-curve/CHANGELOG.md
Expand Up @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## 0.10.5 (2021-07-20)
### Changed
- Pin `zeroize` dependency to v1.4 and `subtle` to v2.4 ([#349])

[#689]: https://github.com/RustCrypto/traits/pull/689

## 0.10.4 (2021-07-12)
### Added
- Re-export `rand_core` ([#683])
Expand Down
6 changes: 3 additions & 3 deletions elliptic-curve/Cargo.toml
Expand Up @@ -5,7 +5,7 @@ General purpose Elliptic Curve Cryptography (ECC) support, including types
and traits for representing various elliptic curve forms, scalars, points,
and public/secret keys composed thereof.
"""
version = "0.10.4" # Also update html_root_url in lib.rs when bumping this
version = "0.10.5" # Also update html_root_url in lib.rs when bumping this
authors = ["RustCrypto Developers"]
license = "Apache-2.0 OR MIT"
repository = "https://github.com/RustCrypto/traits/tree/master/elliptic-curve"
Expand All @@ -18,7 +18,7 @@ keywords = ["crypto", "ecc", "elliptic", "weierstrass"]
crypto-bigint = { version = "0.2.2", features = ["generic-array"] }
generic-array = { version = "0.14", default-features = false }
rand_core = { version = "0.6", default-features = false }
subtle = { version = "2.4", default-features = false }
subtle = { version = "=2.4", default-features = false }

# optional dependencies
base64ct = { version = "1", optional = true, default-features = false }
Expand All @@ -28,7 +28,7 @@ hex-literal = { version = "0.3", optional = true }
pkcs8 = { version = "0.7", optional = true }
serde = { version = "1", optional = true, default-features = false }
serde_json = { version = "1", optional = true, default-features = false, features = ["alloc"] }
zeroize = { version = "1", optional = true, default-features = false }
zeroize = { version = "=1.4", optional = true, default-features = false }

[dev-dependencies]
hex-literal = "0.3"
Expand Down
2 changes: 1 addition & 1 deletion elliptic-curve/src/lib.rs
Expand Up @@ -16,7 +16,7 @@
#![doc(
html_logo_url = "https://raw.githubusercontent.com/RustCrypto/media/8f1a9894/logo.svg",
html_favicon_url = "https://raw.githubusercontent.com/RustCrypto/media/8f1a9894/logo.svg",
html_root_url = "https://docs.rs/elliptic-curve/0.10.4"
html_root_url = "https://docs.rs/elliptic-curve/0.10.5"
)]

#[cfg(feature = "alloc")]
Expand Down
6 changes: 5 additions & 1 deletion password-hash/CHANGELOG.md
Expand Up @@ -5,11 +5,15 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]
## 0.2.2 (2021-07-20)
### Changed
- Pin `subtle` dependency to v2.4 ([#689])

### Added
- Re-export `rand_core` ([#683])

[#683]: https://github.com/RustCrypto/traits/pull/683
[#689]: https://github.com/RustCrypto/traits/pull/689

## 0.2.1 (2021-05-05)
### Changed
Expand Down
4 changes: 2 additions & 2 deletions password-hash/Cargo.toml
Expand Up @@ -5,7 +5,7 @@ Traits which describe the functionality of password hashing algorithms,
as well as a `no_std`-friendly implementation of the PHC string format
(a well-defined subset of the Modular Crypt Format a.k.a. MCF)
"""
version = "0.2.1" # Also update html_root_url in lib.rs when bumping this
version = "0.2.2" # Also update html_root_url in lib.rs when bumping this
authors = ["RustCrypto Developers"]
license = "MIT OR Apache-2.0"
readme = "README.md"
Expand All @@ -17,7 +17,7 @@ keywords = ["crypt", "mcf", "password", "pbkdf", "phc"]

[dependencies]
base64ct = "1"
subtle = { version = "2", default-features = false }
subtle = { version = "=2.4", default-features = false }

# optional features
rand_core = { version = "0.6", optional = true, default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion password-hash/src/lib.rs
Expand Up @@ -39,7 +39,7 @@
#![doc(
html_logo_url = "https://raw.githubusercontent.com/RustCrypto/media/8f1a9894/logo.svg",
html_favicon_url = "https://raw.githubusercontent.com/RustCrypto/media/8f1a9894/logo.svg",
html_root_url = "https://docs.rs/password-hash/0.2.1"
html_root_url = "https://docs.rs/password-hash/0.2.2"
)]
#![forbid(unsafe_code)]
#![warn(missing_docs, rust_2018_idioms)]
Expand Down
6 changes: 6 additions & 0 deletions universal-hash/CHANGELOG.md
Expand Up @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## 0.4.1 (2021-07-20)
### Changed
- Pin `subtle` dependency to v2.4 ([#689])

[#689]: https://github.com/RustCrypto/traits/pull/689

## 0.4.0 (2020-06-04)
### Added
- `Key` and `Block` type aliases ([#128])
Expand Down
4 changes: 2 additions & 2 deletions universal-hash/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "universal-hash"
version = "0.4.0"
version = "0.4.1" # Also update html_root_url in lib.rs when bumping this
authors = ["RustCrypto Developers"]
license = "MIT OR Apache-2.0"
description = "Trait for universal hash functions"
Expand All @@ -13,7 +13,7 @@ edition = "2018"

[dependencies]
generic-array = "0.14"
subtle = { version = "2", default-features = false }
subtle = { version = "=2.4", default-features = false }

[features]
std = []
Expand Down
3 changes: 2 additions & 1 deletion universal-hash/src/lib.rs
Expand Up @@ -21,7 +21,8 @@
#![forbid(unsafe_code)]
#![doc(
html_logo_url = "https://raw.githubusercontent.com/RustCrypto/media/8f1a9894/logo.svg",
html_favicon_url = "https://raw.githubusercontent.com/RustCrypto/media/8f1a9894/logo.svg"
html_favicon_url = "https://raw.githubusercontent.com/RustCrypto/media/8f1a9894/logo.svg",
html_root_url = "https://docs.rs/universal-hash/0.4.1"
)]
#![warn(missing_docs, rust_2018_idioms)]

Expand Down

0 comments on commit f5a24d8

Please sign in to comment.