Skip to content

Bump mcf to v0.6.0-rc.2 #794

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
tarcieri merged 1 commit into from
Jan 3, 2026
+21 −21
Merged

Bump mcf to v0.6.0-rc.2 #794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 14 additions & 14 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.

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 @@ -21,7 +21,7 @@ sha2 = { version = "0.11.0-rc.3", default-features = false }
rayon = { version = "1.11", optional = true }

# optional dependencies
mcf = { version = "0.6.0-rc.1", optional = true }
mcf = { version = "0.6.0-rc.2", optional = true }
password-hash = { version = "0.6.0-rc.7", optional = true, default-features = false }
subtle = { version = "2", optional = true, default-features = false }

Expand Down
2 changes: 1 addition & 1 deletion scrypt/src/mcf.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use password_hash::{
const MCF_ID: &str = "7";

/// Base64 variant used by scrypt.
const SCRYPT_BASE64: Base64 = Base64::ShaCrypt;
const SCRYPT_BASE64: Base64 = Base64::Crypt;

/// Size of a `u32` when using scrypt's fixed-width Base64 encoding.
const ENCODED_U32_LEN: usize = 5;
Expand Down
2 changes: 1 addition & 1 deletion sha-crypt/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ sha2 = { version = "0.11.0-rc.3", default-features = false }
base64ct = { version = "1.8", default-features = false, features = ["alloc"] }

# optional dependencies
mcf = { version = "0.6.0-rc.1", optional = true, default-features = false, features = ["alloc", "base64"] }
mcf = { version = "0.6.0-rc.2", optional = true, default-features = false, features = ["alloc", "base64"] }
password-hash = { version = "0.6.0-rc.7", optional = true, default-features = false }
subtle = { version = "2", optional = true, default-features = false }

Expand Down
4 changes: 2 additions & 2 deletions sha-crypt/src/mcf.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ where
.push_str(&salt)
.map_err(|_| Error::EncodingInvalid)?;

mcf_hash.push_base64(out.as_ref(), Base64::ShaCrypt);
mcf_hash.push_base64(out.as_ref(), Base64::Crypt);

Ok(mcf_hash)
}
Expand Down Expand Up @@ -126,7 +126,7 @@ where
let expected = fields
.next()
.ok_or(Error::EncodingInvalid)?
.decode_base64(Base64::ShaCrypt)
.decode_base64(Base64::Crypt)
.map_err(|_| Error::EncodingInvalid)?;

// should be the last field
Expand Down
2 changes: 1 addition & 1 deletion yescrypt/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ sha2 = { version = "0.11.0-rc.3", default-features = false }
subtle = { version = "2", default-features = false }

# optional dependencies
mcf = { version = "0.6.0-rc.1", optional = true, default-features = false, features = ["alloc", "base64"] }
mcf = { version = "0.6.0-rc.2", optional = true, default-features = false, features = ["alloc", "base64"] }
password-hash = { version = "0.6.0-rc.7", optional = true, default-features = false }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion yescrypt/src/mcf.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use password_hash::{
const YESCRYPT_MCF_ID: &str = "y";

/// Base64 variant used by yescrypt.
const YESCRYPT_BASE64: Base64 = Base64::ShaCrypt;
const YESCRYPT_BASE64: Base64 = Base64::Crypt;

/// yescrypt password hashing type which can produce and verify strings in Modular Crypt Format
/// (MCF) which begin with `$y$`
Expand Down