Skip to content

Commit 3c5c37f

Browse files
authored
pbkdf2: remove default simple feature (#336)
I suspect that most users of this crate care about the low-level `pbkdf2` API as opposed to the higher-level password hashing API which implements the PHC string format. The `simple` API pulls in quite a few dependencies (to the point I'm encountering dependency conflicts).
1 parent 2bba6a1 commit 3c5c37f

File tree

5 files changed

+12
-7
lines changed

5 files changed

+12
-7
lines changed

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bcrypt-pbkdf/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "bcrypt-pbkdf"
3-
version = "0.9.0" # Also update html_root_url in lib.rs when bumping this
3+
version = "0.10.0-pre" # Also update html_root_url in lib.rs when bumping this
44
description = "bcrypt-pbkdf password-based key derivation function"
55
authors = ["RustCrypto Developers"]
66
license = "MIT OR Apache-2.0"
@@ -14,7 +14,7 @@ rust-version = "1.57"
1414

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

pbkdf2/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## Unreleased
9+
### Changed
10+
- `simple` feature is no longer enabled by default ([#336])
11+
12+
[#336]: https://github.com/RustCrypto/password-hashes/pull/336
13+
814
## 0.11.0 (2022-03-28)
915
### Changed
1016
- Bump `password-hash` dependency to v0.4; MSRV 1.57 ([#283])

pbkdf2/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "pbkdf2"
3-
version = "0.11.0"
3+
version = "0.12.0-pre"
44
authors = ["RustCrypto Developers"]
55
license = "MIT OR Apache-2.0"
66
description = "Generic implementation of PBKDF2"
@@ -30,7 +30,6 @@ sha2 = "0.10"
3030
streebog = "0.10"
3131

3232
[features]
33-
default = ["simple"]
3433
parallel = ["rayon", "std"]
3534
simple = ["hmac", "password-hash", "sha2"]
3635
std = ["password-hash/std"]

scrypt/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ rust-version = "1.57"
1414

1515
[dependencies]
1616
hmac = "0.12.1"
17-
pbkdf2 = { version = "0.11", default-features = false, path = "../pbkdf2" }
17+
pbkdf2 = { version = "=0.12.0-pre", default-features = false, path = "../pbkdf2" }
1818
salsa20 = { version = "0.10.2", default-features = false }
1919
sha2 = { version = "0.10", default-features = false }
2020

0 commit comments

Comments
 (0)