Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/argon2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ fn h0(lanes: u32, hash_length: u32, memory_kib: u32, passes: u32, version: u32,

/// Main entry point for running Argon2 on customized parameters (cf. note for
/// `Argon2::new`).
#[derive(Debug, Eq, PartialEq)]
pub struct Argon2 {
passes: u32,
lanes: u32,
Expand Down
11 changes: 11 additions & 0 deletions src/verifier.rs
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@ impl Error for DecodeError {

/// Represents a single Argon2 hashing session. A hash session comprises of the
/// hash algorithm parameters, salt, key, and data used to hash a given input.
#[derive(Debug, Eq, PartialEq)]
pub struct Encoded {
params: Argon2,
hash: Vec<u8>,
Expand Down Expand Up @@ -438,6 +439,16 @@ mod test {
}
}

#[test]
fn encode_decode() {
for &(s, _) in BASE64_CASES.iter() {
let salt = b"Yum! Extra salty";
let key = b"ff5dfa4d7a048f9db4ad0caad82e75c";
let enc = Encoded::default2i(s, salt, key, &[]);
assert_eq!(Encoded::from_u8(&enc.to_u8()), Ok(enc));
}
}

#[test]
fn bad_encoded() {
use super::DecodeError::*;
Expand Down
2 changes: 2 additions & 0 deletions travis.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/bin/sh
set -e
cargo build
cargo test

Expand Down