Skip to content

pbkdf2: make public PBKDF2 Ident values #375

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 3 commits into from
Feb 17, 2023
Merged

pbkdf2: make public PBKDF2 Ident values #375

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c4fba7e
pbkdf2: make public PBKDF2 Ident values
ChanTsune Feb 15, 2023
0772bed
pbkdf2: Added _IDENT as a suffix to each Ident variable
ChanTsune Feb 16, 2023
2e0717a
pbkdf2: move Ident constants to an intrinsic constant of `Algorithm`
ChanTsune Feb 17, 2023
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
34 changes: 17 additions & 17 deletions pbkdf2/src/simple.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,6 @@ use sha2::{Sha256, Sha512};
#[cfg(feature = "sha1")]
use sha1::Sha1;

/// PBKDF2 (SHA-1)
#[cfg(feature = "sha1")]
pub const PBKDF2_SHA1: Ident = Ident::new_unwrap("pbkdf2");

/// PBKDF2 (SHA-256)
pub const PBKDF2_SHA256: Ident = Ident::new_unwrap("pbkdf2-sha256");

/// PBKDF2 (SHA-512)
pub const PBKDF2_SHA512: Ident = Ident::new_unwrap("pbkdf2-sha512");

/// PBKDF2 type for use with [`PasswordHasher`].
#[derive(Copy, Clone, Debug, Eq, PartialEq)]
#[cfg_attr(docsrs, doc(cfg(feature = "simple")))]
Expand All @@ -37,7 +27,7 @@ impl PasswordHasher for Pbkdf2 {
params: Params,
salt: impl Into<Salt<'a>>,
) -> Result<PasswordHash<'a>> {
let algorithm = Algorithm::try_from(alg_id.unwrap_or(PBKDF2_SHA256))?;
let algorithm = Algorithm::try_from(alg_id.unwrap_or(Algorithm::PBKDF2_SHA256_IDENT))?;

// Versions unsupported
if version.is_some() {
Expand Down Expand Up @@ -90,6 +80,16 @@ pub enum Algorithm {
}

impl Algorithm {
/// PBKDF2 (SHA-1) algorithm identifier
#[cfg(feature = "sha1")]
pub const PBKDF2_SHA1_IDENT: Ident<'static> = Ident::new_unwrap("pbkdf2");

/// PBKDF2 (SHA-256) algorithm identifier
pub const PBKDF2_SHA256_IDENT: Ident<'static> = Ident::new_unwrap("pbkdf2-sha256");

/// PBKDF2 (SHA-512) algorithm identifier
pub const PBKDF2_SHA512_IDENT: Ident<'static> = Ident::new_unwrap("pbkdf2-sha512");

/// Parse an [`Algorithm`] from the provided string.
pub fn new(id: impl AsRef<str>) -> Result<Self> {
id.as_ref().parse()
Expand All @@ -99,9 +99,9 @@ impl Algorithm {
pub fn ident(&self) -> Ident<'static> {
match self {
#[cfg(feature = "sha1")]
Algorithm::Pbkdf2Sha1 => PBKDF2_SHA1,
Algorithm::Pbkdf2Sha256 => PBKDF2_SHA256,
Algorithm::Pbkdf2Sha512 => PBKDF2_SHA512,
Algorithm::Pbkdf2Sha1 => Self::PBKDF2_SHA1_IDENT,
Algorithm::Pbkdf2Sha256 => Self::PBKDF2_SHA256_IDENT,
Algorithm::Pbkdf2Sha512 => Self::PBKDF2_SHA512_IDENT,
}
}

Expand Down Expand Up @@ -143,9 +143,9 @@ impl<'a> TryFrom<Ident<'a>> for Algorithm {
fn try_from(ident: Ident<'a>) -> Result<Algorithm> {
match ident {
#[cfg(feature = "sha1")]
PBKDF2_SHA1 => Ok(Algorithm::Pbkdf2Sha1),
PBKDF2_SHA256 => Ok(Algorithm::Pbkdf2Sha256),
PBKDF2_SHA512 => Ok(Algorithm::Pbkdf2Sha512),
Self::PBKDF2_SHA1_IDENT => Ok(Algorithm::Pbkdf2Sha1),
Self::PBKDF2_SHA256_IDENT => Ok(Algorithm::Pbkdf2Sha256),
Self::PBKDF2_SHA512_IDENT => Ok(Algorithm::Pbkdf2Sha512),
_ => Err(Error::Algorithm),
}
}
Expand Down