Remove phc::Ident lifetime (#754)

Companion PR to RustCrypto/traits#2107

Author: tarcieri

Cargo.lock

@@ -11,15 +11,15 @@ use password_hash::phc::Ident;
 
 /// Argon2d algorithm identifier
 #[cfg(feature = "password-hash")]
-pub const ARGON2D_IDENT: Ident<'_> = Ident::new_unwrap("argon2d");
+pub const ARGON2D_IDENT: Ident = Ident::new_unwrap("argon2d");
 
 /// Argon2i algorithm identifier
 #[cfg(feature = "password-hash")]
-pub const ARGON2I_IDENT: Ident<'_> = Ident::new_unwrap("argon2i");
+pub const ARGON2I_IDENT: Ident = Ident::new_unwrap("argon2i");
 
 /// Argon2id algorithm identifier
 #[cfg(feature = "password-hash")]
-pub const ARGON2ID_IDENT: Ident<'_> = Ident::new_unwrap("argon2id");
+pub const ARGON2ID_IDENT: Ident = Ident::new_unwrap("argon2id");
 
 /// Argon2 primitive type: variants of the algorithm.
 #[derive(Copy, Clone, Debug, Eq, PartialEq, PartialOrd, Default, Ord)]
@@ -65,7 +65,7 @@ impl Algorithm {
 
     /// Get the [`Ident`] that corresponds to this Argon2 [`Algorithm`].
     #[cfg(feature = "password-hash")]
-    pub const fn ident(&self) -> Ident<'static> {
+    pub const fn ident(&self) -> Ident {
         match self {
             Algorithm::Argon2d => ARGON2D_IDENT,
             Algorithm::Argon2i => ARGON2I_IDENT,
@@ -105,8 +105,8 @@ impl FromStr for Algorithm {
 }
 
 #[cfg(feature = "password-hash")]
-impl From<Algorithm> for Ident<'static> {
-    fn from(alg: Algorithm) -> Ident<'static> {
+impl From<Algorithm> for Ident {
+    fn from(alg: Algorithm) -> Ident {
         alg.ident()
     }
 }

argon2/src/algorithm.rs

@@ -26,11 +26,11 @@ pub enum Algorithm {
 impl Algorithm {
     /// Balloon algorithm identifier
     #[cfg(feature = "password-hash")]
-    pub const BALLOON_IDENT: Ident<'static> = Ident::new_unwrap("balloon");
+    pub const BALLOON_IDENT: Ident = Ident::new_unwrap("balloon");
 
     /// BalloonM algorithm identifier
     #[cfg(feature = "password-hash")]
-    pub const BALLOON_M_IDENT: Ident<'static> = Ident::new_unwrap("balloon-m");
+    pub const BALLOON_M_IDENT: Ident = Ident::new_unwrap("balloon-m");
 
     /// Parse an [`Algorithm`] from the provided string.
     pub fn new(id: impl AsRef<str>) -> Result<Self> {
@@ -47,7 +47,7 @@ impl Algorithm {
 
     /// Get the [`Ident`] that corresponds to this Balloon [`Algorithm`].
     #[cfg(feature = "password-hash")]
-    pub fn ident(&self) -> Ident<'static> {
+    pub fn ident(&self) -> Ident {
         match self {
             Algorithm::Balloon => Self::BALLOON_IDENT,
             Algorithm::BalloonM => Self::BALLOON_M_IDENT,
@@ -80,8 +80,8 @@ impl FromStr for Algorithm {
 }
 
 #[cfg(feature = "password-hash")]
-impl From<Algorithm> for Ident<'static> {
-    fn from(alg: Algorithm) -> Ident<'static> {
+impl From<Algorithm> for Ident {
+    fn from(alg: Algorithm) -> Ident {
         alg.ident()
     }
 }

balloon-hash/src/algorithm.rs

@@ -120,7 +120,7 @@ pub fn is_hash_obsolete(hash: &str) -> Result<bool, ParseError> {
         || hash.params != default_params_string::<scrypt::Params>());
 
     #[cfg(feature = "pbkdf2")]
-    return Ok(hash.algorithm != pbkdf2::Algorithm::default().ident()
+    return Ok(hash.algorithm != *pbkdf2::Algorithm::default().ident()
         || hash.params != default_params_string::<pbkdf2::Params>());
 
     Ok(true)

password-auth/src/lib.rs

@@ -58,7 +58,7 @@ impl CustomizedPasswordHasher for Pbkdf2 {
         })?;
 
         Ok(PasswordHash {
-            algorithm: algorithm.ident(),
+            algorithm: *algorithm.ident(),
             version: None,
             params: params.try_into()?,
             salt: Some(salt),
@@ -105,26 +105,26 @@ impl Default for Algorithm {
 impl Algorithm {
     /// PBKDF2 (SHA-1) algorithm identifier
     #[cfg(feature = "sha1")]
-    pub const PBKDF2_SHA1_IDENT: Ident<'static> = Ident::new_unwrap("pbkdf2");
+    pub const PBKDF2_SHA1_IDENT: Ident = Ident::new_unwrap("pbkdf2");
 
     /// PBKDF2 (SHA-256) algorithm identifier
-    pub const PBKDF2_SHA256_IDENT: Ident<'static> = Ident::new_unwrap("pbkdf2-sha256");
+    pub const PBKDF2_SHA256_IDENT: Ident = Ident::new_unwrap("pbkdf2-sha256");
 
     /// PBKDF2 (SHA-512) algorithm identifier
-    pub const PBKDF2_SHA512_IDENT: Ident<'static> = Ident::new_unwrap("pbkdf2-sha512");
+    pub const PBKDF2_SHA512_IDENT: Ident = 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()
     }
 
     /// Get the [`Ident`] that corresponds to this PBKDF2 [`Algorithm`].
-    pub fn ident(&self) -> Ident<'static> {
+    pub fn ident(&self) -> &'static Ident {
         match self {
             #[cfg(feature = "sha1")]
-            Algorithm::Pbkdf2Sha1 => Self::PBKDF2_SHA1_IDENT,
-            Algorithm::Pbkdf2Sha256 => Self::PBKDF2_SHA256_IDENT,
-            Algorithm::Pbkdf2Sha512 => Self::PBKDF2_SHA512_IDENT,
+            Algorithm::Pbkdf2Sha1 => &Self::PBKDF2_SHA1_IDENT,
+            Algorithm::Pbkdf2Sha256 => &Self::PBKDF2_SHA256_IDENT,
+            Algorithm::Pbkdf2Sha512 => &Self::PBKDF2_SHA512_IDENT,
         }
     }
 
@@ -154,9 +154,9 @@ impl FromStr for Algorithm {
     }
 }
 
-impl From<Algorithm> for Ident<'static> {
-    fn from(alg: Algorithm) -> Ident<'static> {
-        alg.ident()
+impl From<Algorithm> for Ident {
+    fn from(alg: Algorithm) -> Ident {
+        *alg.ident()
     }
 }
 

pbkdf2/src/simple.rs

@@ -29,7 +29,7 @@ fn hash_with_default_algorithm() {
         .hash_password_customized(PASSWORD.as_bytes(), None, None, params, salt)
         .unwrap();
 
-    assert_eq!(hash.algorithm, Algorithm::Pbkdf2Sha256.ident());
+    assert_eq!(hash.algorithm, *Algorithm::Pbkdf2Sha256.ident());
     assert_eq!(hash.salt.unwrap().as_str(), SALT_B64);
     assert_eq!(Params::try_from(&hash).unwrap(), params);