Skip to content
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

Jump to bottom

Less restrictive convenience hashing functions #35

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Less restrictive convenience hashing functions #35

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3bde7e3
Less restrictive convenience hashing functions
phil-k8r Apr 4, 2018
99a6538
Refactor convenience hashing functions
phil-k8r Apr 7, 2018
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
12 changes: 8 additions & 4 deletions src/argon2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,20 +314,24 @@ impl Argon2 {
/// Convenience wrapper around Argon2i for the majority of use cases where only
/// a password and salt are supplied. Note that a salt between 8 and 2^32 - 1
/// bytes must be provided.
pub fn argon2i_simple(password: &str, salt: &str) -> [u8; defaults::LENGTH] {
pub fn argon2i_simple<P, S>(password: &P, salt: &S) -> [u8; defaults::LENGTH]
where P: AsRef<[u8]> + ?Sized, S: AsRef<[u8]> + ?Sized
{
let mut out = [0; defaults::LENGTH];
let a2 = Argon2::default(Variant::Argon2i);
a2.hash(&mut out, password.as_bytes(), salt.as_bytes(), &[], &[]);
a2.hash(&mut out, password.as_ref(), salt.as_ref(), &[], &[]);
out
}

/// Convenience wrapper around Argon2d for the majority of use cases where only
/// a password and salt are supplied. Note that a salt between 8 and 2^32 - 1
/// bytes must be provided.
pub fn argon2d_simple(password: &str, salt: &str) -> [u8; defaults::LENGTH] {
pub fn argon2d_simple<P, S>(password: &P, salt: &S) -> [u8; defaults::LENGTH]
where P: AsRef<[u8]> + ?Sized, S: AsRef<[u8]> + ?Sized
{
let mut out = [0; defaults::LENGTH];
let a2 = Argon2::default(Variant::Argon2d);
a2.hash(&mut out, password.as_bytes(), salt.as_bytes(), &[], &[]);
a2.hash(&mut out, password.as_ref(), salt.as_ref(), &[], &[]);
out
}

Expand Down