From 10bc803e25b1ca1608be675b3adc35e101b52520 Mon Sep 17 00:00:00 2001
From: Tony Arcieri <bascule@gmail.com>
Date: Mon, 9 Mar 2026 17:40:17 -0600
Subject: [PATCH] password-hash v0.6.0

---
 Cargo.lock                 |  2 +-
 password-hash/CHANGELOG.md | 36 +++++++++++++++++++++++++++++++++---
 password-hash/Cargo.toml   |  4 ++--
 password-hash/LICENSE-MIT  |  2 +-
 4 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b5f2fc3ce..a33486e08 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -449,7 +449,7 @@ dependencies = [
 
 [[package]]
 name = "password-hash"
-version = "0.6.0-rc.12"
+version = "0.6.0"
 dependencies = [
  "getrandom",
  "phc",
diff --git a/password-hash/CHANGELOG.md b/password-hash/CHANGELOG.md
index b7898ad59..1cc235314 100644
--- a/password-hash/CHANGELOG.md
+++ b/password-hash/CHANGELOG.md
@@ -5,15 +5,45 @@ 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.6.0 (UNRELEASED)
+## 0.6.0 (2026-03-10)
+### Added
+- Generic `H` param to traits to support multiple string formats e.g. PHC, MCF ([#2110])
+- Implement `From<phc::Error>` for `Error` ([#2124])
+- `rand_core` feature ([#2126])
+- Salt generating helper functions `(try_)generate_salt` ([#2128])
+- `Error::RngFailure` variant ([#2337])
+
 ### Changed
 - Edition changed to 2024 and MSRV bumped to 1.85 ([#1759])
-- Bump `rand_core` to v0.10 ([#2250])
+- Extract `CustomizedPasswordHasher` trait ([#2105])
 - Bump `getrandom` to v0.4 ([#2258])
 
+### Removed
+- `Encoding` enum ([#2102])
+- PHC types moved to the `phc` crate, which is re-exported as `password_hash::phc` when the `phc`
+  crate feature is enabled ([#2103], [#2116]):
+  - `Ident`
+  - `Output`
+  - `ParamsString`
+  - `PasswordHash`
+  - `PasswordHashString`
+  - `Salt`
+  - `SaltString`
+  - `Value`
+- `McfHasher` trait ([#2334])
+
 [#1759]: https://github.com/RustCrypto/traits/pull/1759
-[#2250]: https://github.com/RustCrypto/traits/pull/2250
+[#2102]: https://github.com/RustCrypto/traits/pull/2102
+[#2103]: https://github.com/RustCrypto/traits/pull/2103
+[#2105]: https://github.com/RustCrypto/traits/pull/2105
+[#2110]: https://github.com/RustCrypto/traits/pull/2110
+[#2116]: https://github.com/RustCrypto/traits/pull/2116
+[#2124]: https://github.com/RustCrypto/traits/pull/2124
+[#2126]: https://github.com/RustCrypto/traits/pull/2126
+[#2128]: https://github.com/RustCrypto/traits/pull/2128
 [#2258]: https://github.com/RustCrypto/traits/pull/2258
+[#2334]: https://github.com/RustCrypto/traits/pull/2334
+[#2337]: https://github.com/RustCrypto/traits/pull/2337
 
 ## 0.5.0 (2023-03-04)
 ### Added
diff --git a/password-hash/Cargo.toml b/password-hash/Cargo.toml
index 38ba951b8..478fb69f9 100644
--- a/password-hash/Cargo.toml
+++ b/password-hash/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "password-hash"
-version = "0.6.0-rc.12"
+version = "0.6.0"
 authors = ["RustCrypto Developers"]
 edition = "2024"
 rust-version = "1.85"
@@ -12,7 +12,7 @@ categories = ["authentication", "cryptography", "no-std"]
 keywords = ["crypt", "mcf", "password", "pbkdf", "phc"]
 description = """
 Traits which describe the functionality of password hashing algorithms, with optional support for a
-`no_std`-friendly implementation of the PHC string format, as well as generic support for other
+`no_std`/`no_alloc`-friendly implementation of the PHC string format, as well as generic support for other
 formats (e.g. Modular Crypt Format)
 """
 
diff --git a/password-hash/LICENSE-MIT b/password-hash/LICENSE-MIT
index b723e3eee..ede6f74f2 100644
--- a/password-hash/LICENSE-MIT
+++ b/password-hash/LICENSE-MIT
@@ -1,4 +1,4 @@
-Copyright (c) 2020-2025 RustCrypto Developers
+Copyright (c) 2020-2026 RustCrypto Developers
 
 Permission is hereby granted, free of charge, to any
 person obtaining a copy of this software and associated