From 4ffba3f071a72ba3940683c463dabc8a17bc9c71 Mon Sep 17 00:00:00 2001
From: Tony Arcieri <bascule@gmail.com>
Date: Sat, 27 Dec 2025 18:44:11 -0700
Subject: [PATCH] password-hash: bump `phc` to v0.6.0-rc.1

---
 Cargo.lock                 | 24 ++++++------------------
 password-hash/Cargo.toml   |  2 +-
 password-hash/src/error.rs |  2 +-
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2e4b0866..9df960cb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -152,7 +152,7 @@ dependencies = [
 name = "crypto-common"
 version = "0.2.0-rc.8"
 dependencies = [
- "getrandom 0.4.0-rc.0",
+ "getrandom",
  "hybrid-array",
  "rand_core",
 ]
@@ -187,7 +187,7 @@ dependencies = [
  "base16ct",
  "crypto-bigint",
  "digest",
- "getrandom 0.4.0-rc.0",
+ "getrandom",
  "hex-literal",
  "hkdf",
  "hybrid-array",
@@ -209,18 +209,6 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
-[[package]]
-name = "getrandom"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
-dependencies = [
- "cfg-if",
- "libc",
- "r-efi",
- "wasip2",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.4.0-rc.0"
@@ -336,7 +324,7 @@ dependencies = [
 name = "password-hash"
 version = "0.6.0-rc.6"
 dependencies = [
- "getrandom 0.4.0-rc.0",
+ "getrandom",
  "phc",
  "rand_core",
 ]
@@ -352,12 +340,12 @@ dependencies = [
 
 [[package]]
 name = "phc"
-version = "0.6.0-rc.0"
+version = "0.6.0-rc.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61f960577aaac5c259bc0866d685ba315c0ed30793c602d7287f54980913863"
+checksum = "71d390c5fe8d102c2c18ff39f1e72b9ad5996de282c2d831b0312f56910f5508"
 dependencies = [
  "base64ct",
- "getrandom 0.3.4",
+ "getrandom",
  "rand_core",
  "subtle",
 ]
diff --git a/password-hash/Cargo.toml b/password-hash/Cargo.toml
index d9748abf..a102ed38 100644
--- a/password-hash/Cargo.toml
+++ b/password-hash/Cargo.toml
@@ -18,7 +18,7 @@ as well as a `no_std`-friendly implementation of the PHC string format
 
 [dependencies]
 getrandom = { version = "0.4.0-rc.0", optional = true, default-features = false }
-phc = { version = "0.6.0-rc.0", optional = true, default-features = false }
+phc = { version = "0.6.0-rc.1", optional = true, default-features = false }
 rand_core = { version = "0.10.0-rc-3", optional = true, default-features = false }
 
 [features]
diff --git a/password-hash/src/error.rs b/password-hash/src/error.rs
index 6a8dd894..eb290b8a 100644
--- a/password-hash/src/error.rs
+++ b/password-hash/src/error.rs
@@ -78,7 +78,7 @@ impl From<getrandom::Error> for Error {
 impl From<phc::Error> for Error {
     fn from(err: phc::Error) -> Self {
         match err {
-            phc::Error::B64Encoding(_) | phc::Error::MissingField | phc::Error::TrailingData => {
+            phc::Error::Base64(_) | phc::Error::MissingField | phc::Error::TrailingData => {
                 Self::EncodingInvalid
             }
             phc::Error::OutputSize { .. } => Self::OutputSize,