Skip to content

pbkdf2: remove default simple feature #336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 30, 2022
Merged

pbkdf2: remove default simple feature #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77a105b
pbkdf2: remove default `simple` feature
tarcieri Aug 29, 2022
9f55564
pbkdf2: update CHANGELOG.md
tarcieri Aug 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions bcrypt-pbkdf/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "bcrypt-pbkdf"
version = "0.9.0" # Also update html_root_url in lib.rs when bumping this
version = "0.10.0-pre" # Also update html_root_url in lib.rs when bumping this
description = "bcrypt-pbkdf password-based key derivation function"
authors = ["RustCrypto Developers"]
license = "MIT OR Apache-2.0"
Expand All @@ -14,7 +14,7 @@ rust-version = "1.57"

[dependencies]
blowfish = { version = "0.9.1", features = ["bcrypt"] }
pbkdf2 = { version = "0.11", default-features = false, path = "../pbkdf2" }
pbkdf2 = { version = "=0.12.0-pre", default-features = false, path = "../pbkdf2" }
sha2 = { version = "0.10.2", default-features = false }
zeroize = { version = "1", default-features = false, optional = true }

Expand Down
6 changes: 6 additions & 0 deletions pbkdf2/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
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).

## Unreleased
### Changed
- `simple` feature is no longer enabled by default ([#336])

[#336]: https://github.com/RustCrypto/password-hashes/pull/336

## 0.11.0 (2022-03-28)
### Changed
- Bump `password-hash` dependency to v0.4; MSRV 1.57 ([#283])
Expand Down
3 changes: 1 addition & 2 deletions pbkdf2/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pbkdf2"
version = "0.11.0"
version = "0.12.0-pre"
Copy link
Member Author

@tarcieri tarcieri Aug 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In addition to this change, I think we're about due for another release of password-hash

authors = ["RustCrypto Developers"]
license = "MIT OR Apache-2.0"
description = "Generic implementation of PBKDF2"
Expand Down Expand Up @@ -30,7 +30,6 @@ sha2 = "0.10"
streebog = "0.10"

[features]
default = ["simple"]
parallel = ["rayon", "std"]
simple = ["hmac", "password-hash", "sha2"]
std = ["password-hash/std"]
Expand Down
2 changes: 1 addition & 1 deletion scrypt/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ rust-version = "1.57"

[dependencies]
hmac = "0.12.1"
pbkdf2 = { version = "0.11", default-features = false, path = "../pbkdf2" }
pbkdf2 = { version = "=0.12.0-pre", default-features = false, path = "../pbkdf2" }
salsa20 = { version = "0.10.2", default-features = false }
sha2 = { version = "0.10", default-features = false }

Expand Down